diff options
| author | Matt Mackall <mpm@selenic.com> | 2006-03-28 01:56:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 09:16:01 -0800 |
| commit | 4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc (patch) | |
| tree | 2f08f6e498346ae5e41c60f6d8abd1f5a7b091ad /arch/sh64 | |
| parent | 41623b064fbd76de5901da7c0e3cd2136617d787 (diff) | |
[PATCH] RTC: Remove some duplicate BCD definitions
Remove some duplicate BCD definitions
Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh64')
| -rw-r--r-- | arch/sh64/kernel/time.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 0773c9f389f..6b8f4d22abc 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c @@ -30,6 +30,7 @@ #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,14 +106,6 @@ #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; |