SPIN_LOCK_UNLOCKED cleanup in arch/m68k
[linux-2.6.git] / arch / m68k / apollo / dn_ints.c
index 9fe0780..13bd41b 100644 (file)
@@ -6,7 +6,7 @@
 
 void dn_process_int(unsigned int irq, struct pt_regs *fp)
 {
-       m68k_handle_int(irq, fp);
+       __m68k_handle_int(irq, fp);
 
        *(volatile unsigned char *)(pica)=0x20;
        *(volatile unsigned char *)(picb)=0x20;
@@ -31,7 +31,7 @@ void apollo_irq_shutdown(unsigned int irq)
 
 static struct irq_controller apollo_irq_controller = {
        .name           = "apollo",
-       .lock           = SPIN_LOCK_UNLOCKED,
+       .lock           = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
        .startup        = apollo_irq_startup,
        .shutdown       = apollo_irq_shutdown,
 };