linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / sh64 / kernel / time.c

diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c
index b8162e5..0773c9f 100644 (file)
--- a/arch/sh64/kernel/time.c
+++ b/arch/sh64/kernel/time.c
@@ -15,6 +15,7 @@
  *      Copyright (C) 1991, 1992, 1995  Linus Torvalds
  */
 
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -29,7 +30,6 @@
 #include <linux/profile.h>
 #include <linux/smp.h>
 #include <linux/module.h>
-#include <linux/bcd.h>
 
 #include <asm/registers.h>      /* required by inline __asm__ stmt. */
 
@@ -105,6 +105,14 @@
 #define RCR1           rtc_base+0x38
 #define RCR2           rtc_base+0x3c
 
+#ifndef BCD_TO_BIN
+#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
+#endif
+
+#ifndef BIN_TO_BCD
+#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
+#endif
+
 #define TICK_SIZE (tick_nsec / 1000)
 
 extern unsigned long wall_jiffies;
@@ -484,8 +492,8 @@ static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id,
        return IRQ_HANDLED;
 }
 
-static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};
-static struct irqaction irq1  = { sh64_rtc_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "rtc", NULL, NULL};
+static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};
+static struct irqaction irq1  = { sh64_rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL};
 
 void __init time_init(void)
 {