linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index f714954..b309b1b 100644 (file)
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -17,7 +17,7 @@
 
 extern asmlinkage void jazz_handle_int(void);
 
-static spinlock_t r4030_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(r4030_lock);
 
 static void enable_r4030_irq(unsigned int irq)
 {
@@ -58,14 +58,13 @@ static void end_r4030_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type r4030_irq_type = {
-       "R4030",
-       startup_r4030_irq,
-       shutdown_r4030_irq,
-       enable_r4030_irq,
-       disable_r4030_irq,
-       mask_and_ack_r4030_irq,
-       end_r4030_irq,
-       NULL
+       .typename = "R4030",
+       .startup = startup_r4030_irq,
+       .shutdown = shutdown_r4030_irq,
+       .enable = enable_r4030_irq,
+       .disable = disable_r4030_irq,
+       .ack = mask_and_ack_r4030_irq,
+       .end = end_r4030_irq,
 };
 
 void __init init_r4030_ints(void)