From: Wolfgang Denk <wd@denx.de>
Date: Fri, 11 Sep 2009 09:37:20 +0000 (+0200)
Subject: board/etin/debris/phantom.c: Fix compile error
X-Git-Tag: v2010.09-rc1~28^2~7^2~42^2~106
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2dce9d63b32a16dc504cb85d82d56c899c0db3b8;p=u-boot

board/etin/debris/phantom.c: Fix compile error

Fix build problem caused by commit e84aba13: "Replace BCD2BIN and
BIN2BCD macros with inline functions"

phantom.c:163: error: redefinition of 'bcd2bin'
/home/wd/git/u-boot/work/include/bcd.h:16: error: previous definition of 'bcd2bin' was here
phantom.c:168: error: redefinition of 'bin2bcd'
/home/wd/git/u-boot/work/include/bcd.h:21: error: previous definition of 'bin2bcd' was here

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Sangmoon Kim <dogoil@etinsys.com>
---

diff --git a/board/etin/debris/phantom.c b/board/etin/debris/phantom.c
index fcb4c40eaa..63feb7c2c3 100644
--- a/board/etin/debris/phantom.c
+++ b/board/etin/debris/phantom.c
@@ -159,16 +159,6 @@ void rtc_reset(void)
 	}
 }
 
-inline unsigned bcd2bin (uchar n)
-{
-	return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-inline unsigned char bin2bcd (unsigned int n)
-{
-	return (((n / 10) << 4) | (n % 10));
-}
-
 static int get_century_flag(void)
 {
 	int flag = 0;