Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / arm / mach-footbridge / isa-irq.c

diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c
index e1c43b3..87448c2 100644 (file)
--- 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)
 {