vserver 1.9.5.x5

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

diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index caa44d1..62c760f 100644 (file)
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/sni.h>
 
-spinlock_t pciasic_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(pciasic_lock);
 
 extern asmlinkage void sni_rm200_pci_handle_int(void);
 
@@ -173,13 +173,12 @@ void __init init_pciasic(void)
  * driver compatibility reasons interrupts 0 - 15 to be the i8295
  * interrupts even if the hardware uses a different interrupt numbering.
  */
-void __init init_IRQ (void)
+void __init arch_init_irq(void)
 {
        int i;
 
        set_except_vector(0, sni_rm200_pci_handle_int);
 
-       init_generic_irq();
        init_i8259_irqs();                      /* Integrated i8259  */
        init_pciasic();