vserver 1.9.5.x5

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

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index e81e234..0b608fa 100644 (file)
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -17,13 +17,11 @@
 
 extern asmlinkage void jazz_handle_int(void);
 
-static spinlock_t r4030_lock = SPIN_LOCK_UNLOCKED;
-
-extern asmlinkage void sni_rm200_pci_handle_int(void);
+static DEFINE_SPINLOCK(r4030_lock);
 
 static void enable_r4030_irq(unsigned int irq)
 {
-       unsigned int mask = 1 << (irq - JAZZ_IE_PARALLEL);
+       unsigned int mask = 1 << (irq - JAZZ_PARALLEL_IRQ);
        unsigned long flags;
 
        spin_lock_irqsave(&r4030_lock, flags);
@@ -42,7 +40,7 @@ static unsigned int startup_r4030_irq(unsigned int irq)
 
 void disable_r4030_irq(unsigned int irq)
 {
-       unsigned int mask = ~(1 << (irq - JAZZ_IE_PARALLEL));
+       unsigned int mask = ~(1 << (irq - JAZZ_PARALLEL_IRQ));
        unsigned long flags;
 
        spin_lock_irqsave(&r4030_lock, flags);
@@ -91,11 +89,10 @@ void __init init_r4030_ints(void)
  * driver compatibility reasons interrupts 0 - 15 to be the i8259
  * interrupts even if the hardware uses a different interrupt numbering.
  */
-void __init init_IRQ (void)
+void __init arch_init_irq(void)
 {
        set_except_vector(0, jazz_handle_int);
 
-       init_generic_irq();
        init_i8259_irqs();                      /* Integrated i8259  */
        init_r4030_ints();