summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mpc1211
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2006-03-28 11:56:10 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 19:16:01 +0200
commit4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc (patch)
tree2f08f6e498346ae5e41c60f6d8abd1f5a7b091ad /arch/sh/boards/mpc1211
parent[PATCH] RTC: Fix up some RTC whitespace and style (diff)
downloadlinux-4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc.tar.xz
linux-4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc.zip
[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/sh/boards/mpc1211')
-rw-r--r--arch/sh/boards/mpc1211/rtc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/sh/boards/mpc1211/rtc.c b/arch/sh/boards/mpc1211/rtc.c
index 8ae2dc11d8e5..a76c655dceee 100644
--- a/arch/sh/boards/mpc1211/rtc.c
+++ b/arch/sh/boards/mpc1211/rtc.c
@@ -9,16 +9,9 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/time.h>
+#include <linux/bcd.h>
#include <linux/mc146818rtc.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
-
unsigned long get_cmos_time(void)
{
unsigned int year, mon, day, hour, min, sec;