]> err.no Git - linux-2.6/blobdiff - arch/arm/common/time-acorn.c
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-2.6] / arch / arm / common / time-acorn.c
index 31b65e2231d9d76e384763d7323ff3c958d5546d..34038eccbba9e478b3bfb75ec283e289fee63cb2 100644 (file)
@@ -67,17 +67,17 @@ void __init ioctime_init(void)
 }
 
 static irqreturn_t
-ioc_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ioc_timer_interrupt(int irq, void *dev_id)
 {
        write_seqlock(&xtime_lock);
-       timer_tick(regs);
+       timer_tick();
        write_sequnlock(&xtime_lock);
        return IRQ_HANDLED;
 }
 
 static struct irqaction ioc_timer_irq = {
        .name           = "timer",
-       .flags          = SA_INTERRUPT,
+       .flags          = IRQF_DISABLED,
        .handler        = ioc_timer_interrupt
 };