[ARM] Fix two bugs in Acorn expansion card subsystem

- Setup synchronous expansion card resource.
- Fix order of IRQ and FIQ mask/offsets.

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index e47084d86cf7d795cd9f80342345a26a796307c8..d3dafbf4f3815bc1411bb30e7c55ac8d130a2968 100644 (file)
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -841,7 +841,7 @@ static void __init ecard_init_resources(struct expansion_card *ec)
        } else
 #endif
 
-       for (i = 0; i < ECARD_RES_IOCSYNC - ECARD_RES_IOCSLOW; i++) {
+       for (i = 0; i <= ECARD_RES_IOCSYNC - ECARD_RES_IOCSLOW; i++) {
                ec_set_resource(ec, i + ECARD_RES_IOCSLOW,
                                base + (slot << 14) + (i << 19),
                                PODSLOT_IOC_SIZE, IORESOURCE_MEM);

diff --git a/include/asm-arm/ecard.h b/include/asm-arm/ecard.h
index fe356f18b98d58bd16fc0840175035b7edc9838e..0aa513f2ccae87e7731f7733f3a0f9f340fbf15a 100644 (file)
--- a/include/asm-arm/ecard.h
+++ b/include/asm-arm/ecard.h
@@ -241,11 +241,11 @@ struct ex_ecid {
 
        unsigned char   r_country;
 
-       unsigned char   r_irqmask;
-       unsigned char   r_irqoff[3];
-
        unsigned char   r_fiqmask;
        unsigned char   r_fiqoff[3];
+
+       unsigned char   r_irqmask;
+       unsigned char   r_irqoff[3];
 };
 
 /*