summaryrefslogtreecommitdiff
path: root/arch/mips/tx4938
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2006-03-28 13:56:10 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 21:16:01 +0400
commit4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc (patch)
tree2f08f6e498346ae5e41c60f6d8abd1f5a7b091ad /arch/mips/tx4938
parent41623b064fbd76de5901da7c0e3cd2136617d787 (diff)
downloadlinux-4f3a36a7d0eb420471506fcd46ee46f4b5cd4ebc.tar.xz
[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/mips/tx4938')
-rw-r--r--arch/mips/tx4938/common/rtc_rx5c348.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/tx4938/common/rtc_rx5c348.c b/arch/mips/tx4938/common/rtc_rx5c348.c
index f74295f28527..07f782fc0725 100644
--- a/arch/mips/tx4938/common/rtc_rx5c348.c
+++ b/arch/mips/tx4938/common/rtc_rx5c348.c
@@ -14,6 +14,7 @@
#include <linux/string.h>
#include <linux/rtc.h>
#include <linux/time.h>
+#include <linux/bcd.h>
#include <asm/time.h>
#include <asm/tx4938/spi.h>
@@ -77,17 +78,6 @@ spi_rtc_io(unsigned char *inbuf, unsigned char *outbuf, unsigned int count)
inbufs, incounts, outbufs, outcounts, 0);
}
-/*
- * Conversion between binary and BCD.
- */
-#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
-
/* RTC-dependent code for time.c */
static int