From: Jean Delvare <khali@linux-fr.org>

Use the standard BCD macros instead of redefining them.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/m68k/bvme6000/rtc.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN arch/m68k/bvme6000/rtc.c~m68k-rtc-driver-cleanup arch/m68k/bvme6000/rtc.c
--- devel/arch/m68k/bvme6000/rtc.c~m68k-rtc-driver-cleanup	2006-02-15 12:57:24.000000000 -0800
+++ devel-akpm/arch/m68k/bvme6000/rtc.c	2006-02-15 12:57:24.000000000 -0800
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/mc146818rtc.h>	/* For struct rtc_time and ioctls, etc */
 #include <linux/smp_lock.h>
+#include <linux/bcd.h>
 #include <asm/bvme6000hw.h>
 
 #include <asm/io.h>
@@ -32,9 +33,6 @@
  *	ioctls.
  */
 
-#define BCD2BIN(val) (((val)&15) + ((val)>>4)*10)
-#define BIN2BCD(val) ((((val)/10)<<4) + (val)%10)
-
 static unsigned char days_in_mo[] =
 {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
_