linux 2.6.16.38 w/ vs2.0.3-rc1

[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..952038a 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);
 
@@ -58,14 +58,13 @@ static void end_pciasic_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type pciasic_irq_type = {
-       "ASIC-PCI",
-       startup_pciasic_irq,
-       shutdown_pciasic_irq,
-       enable_pciasic_irq,
-       disable_pciasic_irq,
-       mask_and_ack_pciasic_irq,
-       end_pciasic_irq,
-       NULL
+       .typename = "ASIC-PCI",
+       .startup = startup_pciasic_irq,
+       .shutdown = shutdown_pciasic_irq,
+       .enable = enable_pciasic_irq,
+       .disable = disable_pciasic_irq,
+       .ack = mask_and_ack_pciasic_irq,
+       .end = end_pciasic_irq,
 };
 
 /*
@@ -103,7 +102,7 @@ static unsigned int ls1bit8(unsigned int x)
 
 /*
  * hwint 1 deals with EISA and SCSI interrupts,
- * 
+ *
  * The EISA_INT bit in CSITPEND is high active, all others are low active.
  */
 void pciasic_hwint1(struct pt_regs *regs)
@@ -173,13 +172,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();