From 6e627d55d026819528c652e825de63e8f869c094 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sat, 18 Oct 2008 20:28:45 -0700
Subject: [PATCH] --- yaml --- r: 115970 b: refs/heads/master c:
 f6a2298c5fd1f074aa3626febea33f48cd3b5a94 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cea45beaca66..317eb942e198 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02112dbc925f664bc4d24ff098686b9d21bfbfb1
+refs/heads/master: f6a2298c5fd1f074aa3626febea33f48cd3b5a94
diff --git a/trunk/arch/mn10300/kernel/rtc.c b/trunk/arch/mn10300/kernel/rtc.c
index 042f792d8430..7978470b5749 100644
--- a/trunk/arch/mn10300/kernel/rtc.c
+++ b/trunk/arch/mn10300/kernel/rtc.c
@@ -67,7 +67,7 @@ static int set_rtc_mmss(unsigned long nowtime)
 
 	cmos_minutes = CMOS_READ(RTC_MINUTES);
 	if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-		BCD_TO_BIN(cmos_minutes);
+		cmos_minutes = bcd2bin(cmos_minutes);
 
 	/*
 	 * since we're only adjusting minutes and seconds,
@@ -84,8 +84,8 @@ static int set_rtc_mmss(unsigned long nowtime)
 
 	if (abs(real_minutes - cmos_minutes) < 30) {
 		if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-			BIN_TO_BCD(real_seconds);
-			BIN_TO_BCD(real_minutes);
+			real_seconds = bin2bcd(real_seconds);
+			real_minutes = bin2bcd(real_minutes);
 		}
 		CMOS_WRITE(real_seconds, RTC_SECONDS);
 		CMOS_WRITE(real_minutes, RTC_MINUTES);