aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/isa-irq.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-03 08:18:04 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-03 08:18:04 -0400
commit020732ad9add86b71e9d90d5fa7687d51f58ef49 (patch)
tree323c94f274aa5c107187f52f8ef121078ab97d9a /arch/arm/mach-footbridge/isa-irq.c
parent906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 (diff)
[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/arm/mach-footbridge/isa-irq.c')
-rw-r--r--arch/arm/mach-footbridge/isa-irq.c19
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)
98 desc_handle_irq(isa_irq, desc, regs); 98 desc_handle_irq(isa_irq, desc, regs);
99} 99}
100 100
101static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", }; 101static struct irqaction irq_cascade = {
102static struct resource pic1_resource = { "pic1", 0x20, 0x3f }; 102 .handler = no_action,
103static struct resource pic2_resource = { "pic2", 0xa0, 0xbf }; 103 .name = "cascade",
104};
105
106static struct resource pic1_resource = {
107 .name = "pic1",
108 .start = 0x20,
109 .end = 0x3f,
110};
111
112static struct resource pic2_resource = {
113 .name = "pic2",
114 .start = 0xa0,
115 .end = 0xbf,
116};
104 117
105void __init isa_init_irq(unsigned int host_irq) 118void __init isa_init_irq(unsigned int host_irq)
106{ 119{