git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6b8f4d2
..
0773c9f
100644
(file)
--- a/
arch/sh64/kernel/time.c
+++ b/
arch/sh64/kernel/time.c
@@
-30,7
+30,6
@@
#include <linux/profile.h>
#include <linux/smp.h>
#include <linux/module.h>
#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. */
#include <asm/registers.h> /* required by inline __asm__ stmt. */
@@
-106,6
+105,14
@@
#define RCR1 rtc_base+0x38
#define RCR2 rtc_base+0x3c
#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;
#define TICK_SIZE (tick_nsec / 1000)
extern unsigned long wall_jiffies;