From 03191b04007e4dfc6c4901136b8dde3fa5e573c8 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 23 Mar 2006 03:00:09 -0800
Subject: [PATCH] --- yaml --- r: 23026 b: refs/heads/master c:
 b8e31edc10d160a8bf2159541d9d12f2079a0887 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/m68k/bvme6000/rtc.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 08b8c8c25d50..7d87c984946f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b238205ba5d79a8a242d7a5ddb82b89e4dc4e48
+refs/heads/master: b8e31edc10d160a8bf2159541d9d12f2079a0887
diff --git a/trunk/arch/m68k/bvme6000/rtc.c b/trunk/arch/m68k/bvme6000/rtc.c
index 703cbc6dc9cc..15c16b62dff5 100644
--- a/trunk/arch/m68k/bvme6000/rtc.c
+++ b/trunk/arch/m68k/bvme6000/rtc.c
@@ -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};