1 files changed, 8 insertions, 14 deletions

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 067857046137..af9ed33bec14 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -281,7 +281,7 @@ void __init via_init_clock(irq_handler_t func)
         via1[vT1CL] = MAC_CLOCK_LOW;
         via1[vT1CH] = MAC_CLOCK_HIGH;
 
-        if (request_irq(IRQ_MAC_TIMER_1, func, IRQ_FLG_LOCK, "timer", func))
+        if (request_irq(IRQ_MAC_TIMER_1, func, 0, "timer", func))
                 pr_err("Couldn't register %s interrupt\n", "timer");
 }
 
@@ -292,25 +292,19 @@ void __init via_init_clock(irq_handler_t func)
 void __init via_register_interrupts(void)
 {
         if (via_alt_mapping) {
-                if (request_irq(IRQ_AUTO_1, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "software",
-                                (void *) via1))
+                if (request_irq(IRQ_AUTO_1, via1_irq, 0, "software",
+                                (void *)via1))
                         pr_err("Couldn't register %s interrupt\n", "software");
-                if (request_irq(IRQ_AUTO_6, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
-                                (void *) via1))
+                if (request_irq(IRQ_AUTO_6, via1_irq, 0, "via1", (void *)via1))
                         pr_err("Couldn't register %s interrupt\n", "via1");
         } else {
-                if (request_irq(IRQ_AUTO_1, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
-                                (void *) via1))
+                if (request_irq(IRQ_AUTO_1, via1_irq, 0, "via1", (void *)via1))
                         pr_err("Couldn't register %s interrupt\n", "via1");
         }
-        if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
-                        "via2", (void *) via2))
+        if (request_irq(IRQ_AUTO_2, via2_irq, 0, "via2", (void *)via2))
                 pr_err("Couldn't register %s interrupt\n", "via2");
-        if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq,
-                        IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2))
+        if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, 0, "nubus",
+                        (void *)via2))
                 pr_err("Couldn't register %s interrupt\n", "nubus");
 }