From 0fd3d902d920f3e60f88530c33f1ae7581260951 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 11 Sep 2009 11:37:20 +0200 Subject: [PATCH] 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 Cc: Sangmoon Kim --- board/etin/debris/phantom.c | 10 ---------- 1 file changed, 10 deletions(-) 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; -- 2.30.2