linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / kernel / irq_cpu.c

diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 9bb21c7..5db67e3 100644 (file)
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -94,7 +94,7 @@ static void mips_cpu_irq_end(unsigned int irq)
                unmask_mips_irq(irq);
 }
 
-static struct irq_chip mips_cpu_irq_controller = {
+static hw_irq_controller mips_cpu_irq_controller = {
        .typename       = "MIPS",
        .startup        = mips_cpu_irq_startup,
        .shutdown       = mips_cpu_irq_shutdown,
@@ -140,7 +140,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
 
 #define mips_mt_cpu_irq_end mips_cpu_irq_end
 
-static struct irq_chip mips_mt_cpu_irq_controller = {
+static hw_irq_controller mips_mt_cpu_irq_controller = {
        .typename       = "MIPS",
        .startup        = mips_mt_cpu_irq_startup,
        .shutdown       = mips_mt_cpu_irq_shutdown,
@@ -167,14 +167,14 @@ void __init mips_cpu_irq_init(int irq_base)
                        irq_desc[i].status = IRQ_DISABLED;
                        irq_desc[i].action = NULL;
                        irq_desc[i].depth = 1;
-                       irq_desc[i].chip = &mips_mt_cpu_irq_controller;
+                       irq_desc[i].handler = &mips_mt_cpu_irq_controller;
                }
 
        for (i = irq_base + 2; i < irq_base + 8; i++) {
                irq_desc[i].status = IRQ_DISABLED;
                irq_desc[i].action = NULL;
                irq_desc[i].depth = 1;
-               irq_desc[i].chip = &mips_cpu_irq_controller;
+               irq_desc[i].handler = &mips_cpu_irq_controller;
        }
 
        mips_cpu_irq_base = irq_base;