linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / momentum / jaguar_atx / irq.c

diff --git a/arch/mips/momentum/jaguar_atx/irq.c b/arch/mips/momentum/jaguar_atx/irq.c
index f13f856..15588f9 100644 (file)
--- a/arch/mips/momentum/jaguar_atx/irq.c
+++ b/arch/mips/momentum/jaguar_atx/irq.c
@@ -42,10 +42,10 @@
 extern asmlinkage void jaguar_handle_int(void);
 
 static struct irqaction cascade_mv64340 = {
-       no_action, SA_INTERRUPT, 0, "MV64340-Cascade", NULL, NULL
+       no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL
 };
 
-void __init init_IRQ(void)
+void __init arch_init_irq(void)
 {
        /*
         * Clear all of the interrupts while we change the able around a bit.
@@ -55,7 +55,6 @@ void __init init_IRQ(void)
 
        /* Sets the first-level interrupt dispatcher. */
        set_except_vector(0, jaguar_handle_int);
-       init_generic_irq();
        mips_cpu_irq_init(0);
        rm7k_cpu_irq_init(8);