linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / ddb5xxx / ddb5476 / vrc5476_irq.c

diff --git a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
index c662dd2..f66fe5b 100644 (file)
--- a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
+++ b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
@@ -53,28 +53,26 @@ static void vrc5476_irq_end(uint irq)
 }
 
 static hw_irq_controller vrc5476_irq_controller = {
-       "vrc5476",
-       vrc5476_irq_startup,
-       vrc5476_irq_shutdown,
-       vrc5476_irq_enable,
-       vrc5476_irq_disable,
-       vrc5476_irq_ack,
-       vrc5476_irq_end,
-       NULL                            /* no affinity stuff for UP */
+       .typename = "vrc5476",
+       .startup = vrc5476_irq_startup,
+       .shutdown = vrc5476_irq_shutdown,
+       .enable = vrc5476_irq_enable,
+       .disable = vrc5476_irq_disable,
+       .ack = vrc5476_irq_ack,
+       .end = vrc5476_irq_end
 };
 
 void __init
 vrc5476_irq_init(u32 base)
 {
-       extern irq_desc_t irq_desc[];
        u32 i;
 
        irq_base = base;
        for (i= base; i< base + NUM_VRC5476_IRQ; i++) {
                irq_desc[i].status = IRQ_DISABLED;
                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].handler = &vrc5476_irq_controller;
+               irq_desc[i].depth = 1;
+               irq_desc[i].handler = &vrc5476_irq_controller;
        }
 }