Merge tag 'exfat-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linki...

[linux-2.6-microblaze.git] / arch / m68k / mvme147 / config.c

diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index ead0e51..cfdc7f9 100644 (file)
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -37,7 +37,7 @@
 
 
 static void mvme147_get_model(char *model);
-extern void mvme147_sched_init(irq_handler_t handler);
+extern void mvme147_sched_init(void);
 extern int mvme147_hwclk (int, struct rtc_time *);
 extern void mvme147_reset (void);
 
@@ -111,24 +111,23 @@ static u32 clk_total;
 
 static irqreturn_t mvme147_timer_int (int irq, void *dev_id)
 {
-       irq_handler_t timer_routine = dev_id;
        unsigned long flags;
 
        local_irq_save(flags);
        m147_pcc->t1_int_cntrl = PCC_TIMER_INT_CLR;
        m147_pcc->t1_cntrl = PCC_TIMER_CLR_OVF;
        clk_total += PCC_TIMER_CYCLES;
-       timer_routine(0, NULL);
+       legacy_timer_tick(1);
        local_irq_restore(flags);
 
        return IRQ_HANDLED;
 }
 
 
-void mvme147_sched_init (irq_handler_t timer_routine)
+void mvme147_sched_init (void)
 {
        if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQF_TIMER,
-                       "timer 1", timer_routine))
+                       "timer 1", NULL))
                pr_err("Couldn't register timer interrupt\n");
 
        /* Init the clock with a value */