X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fv850%2Fkernel%2Ftime.c;fp=arch%2Fv850%2Fkernel%2Ftime.c;h=c1e85c2aef65093f0ae70c90d8f1efc893e1e1b3;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=690dbfa367254c58811ec00528135915ef44ef41;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index 690dbfa36..c1e85c2ae 100644
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -10,6 +10,7 @@
  *		"A Kernel Model for Precision Timekeeping" by Dave Mills
  */
 
+#include <linux/config.h> /* CONFIG_HEARTBEAT */
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -176,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday);
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
 	timer_interrupt,
-	IRQF_DISABLED,
+	SA_INTERRUPT,
 	CPU_MASK_NONE,
 	"timer",
 	&timer_dev_id,