diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-07-03 16:18:04 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-03 16:18:04 +0400 |
| commit | 020732ad9add86b71e9d90d5fa7687d51f58ef49 (patch) | |
| tree | 323c94f274aa5c107187f52f8ef121078ab97d9a /arch | |
| parent | 906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 (diff) | |
| download | linux-020732ad9add86b71e9d90d5fa7687d51f58ef49.tar.xz | |
[ARM] Fix ISA IRQ resources
The ISA IRQ code was not using named initialisers, so merging the
64-bit resource code (which re-ordered the struct members) broke
this. Fix it up to use named initialisers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-footbridge/isa-irq.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index e1c43b331d64..87448c2d6baa 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -98,9 +98,22 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) desc_handle_irq(isa_irq, desc, regs); } -static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", }; -static struct resource pic1_resource = { "pic1", 0x20, 0x3f }; -static struct resource pic2_resource = { "pic2", 0xa0, 0xbf }; +static struct irqaction irq_cascade = { + .handler = no_action, + .name = "cascade", +}; + +static struct resource pic1_resource = { + .name = "pic1", + .start = 0x20, + .end = 0x3f, +}; + +static struct resource pic2_resource = { + .name = "pic2", + .start = 0xa0, + .end = 0xbf, +}; void __init isa_init_irq(unsigned int host_irq) { |