Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

[linux-2.6] / arch / arm / mach-integrator / core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index bd1e5e3c9d34b2e055f6d12763e2735b3994daf4..9222e57bd87263bcbe3aee6b56d7c18cdb47d7f6 100644 (file)
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -247,8 +247,8 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction integrator_timer_irq = {
        .name           = "Integrator Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = integrator_timer_interrupt
+       .flags          = SA_INTERRUPT | SA_TIMER,
+       .handler        = integrator_timer_interrupt,
 };
 
 /*