linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / sh / kernel / cpu / rtc.c

diff --git a/arch/sh/kernel/cpu/rtc.c b/arch/sh/kernel/cpu/rtc.c
index 4304cf7..f8361f5 100644 (file)
--- a/arch/sh/kernel/cpu/rtc.c
+++ b/arch/sh/kernel/cpu/rtc.c
@@ -9,10 +9,18 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/time.h>
-#include <linux/bcd.h>
+
 #include <asm/io.h>
 #include <asm/rtc.h>
 
+#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
+
 void sh_rtc_gettimeofday(struct timespec *ts)
 {
        unsigned int sec128, sec, sec2, min, hr, wk, day, mon, yr, yr100, cf_bit;