Commit 97e5cc05 authored by Russell King's avatar Russell King

[ARM] Fix two bugs in Acorn expansion card subsystem

- Setup synchronous expansion card resource.
- Fix order of IRQ and FIQ mask/offsets.
parent 5ddb5e94
...@@ -841,7 +841,7 @@ static void __init ecard_init_resources(struct expansion_card *ec) ...@@ -841,7 +841,7 @@ static void __init ecard_init_resources(struct expansion_card *ec)
} else } else
#endif #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, ec_set_resource(ec, i + ECARD_RES_IOCSLOW,
base + (slot << 14) + (i << 19), base + (slot << 14) + (i << 19),
PODSLOT_IOC_SIZE, IORESOURCE_MEM); PODSLOT_IOC_SIZE, IORESOURCE_MEM);
......
...@@ -241,11 +241,11 @@ struct ex_ecid { ...@@ -241,11 +241,11 @@ struct ex_ecid {
unsigned char r_country; unsigned char r_country;
unsigned char r_irqmask;
unsigned char r_irqoff[3];
unsigned char r_fiqmask; unsigned char r_fiqmask;
unsigned char r_fiqoff[3]; unsigned char r_fiqoff[3];
unsigned char r_irqmask;
unsigned char r_irqoff[3];
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment