Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[linux-2.6] / arch / v850 / kernel / time.c

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index c1e85c2aef65093f0ae70c90d8f1efc893e1e1b3..a0b46695f186f03921a7a09b66cde5af0bf5bfa8 100644 (file)
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -177,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday);
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
        timer_interrupt,
-       SA_INTERRUPT,
+       IRQF_DISABLED,
        CPU_MASK_NONE,
        "timer",
        &timer_dev_id,