Re: [U-Boot] [PATCH] board/etin/debris/phantom.c: Fix compile error

2009-09-14 Thread Wolfgang Denk 
In message 1252662563-18284-3-git-send-email...@denx.de you wrote:
 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 w...@denx.de
 Cc: Sangmoon Kim dog...@etinsys.com
 ---
  board/etin/debris/phantom.c |   10 --
  1 files changed, 0 insertions(+), 10 deletions(-)

Applied.

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
Plan to throw one away.  You will anyway.
  - Fred Brooks, The Mythical Man Month
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] board/etin/debris/phantom.c: Fix compile error

2009-09-11 Thread Wolfgang Denk 
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 w...@denx.de
Cc: Sangmoon Kim dog...@etinsys.com
---
 board/etin/debris/phantom.c |   10 --
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/board/etin/debris/phantom.c b/board/etin/debris/phantom.c
index fcb4c40..63feb7c 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;
-- 
1.6.0.6

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot