diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-11 11:37:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-15 00:17:56 +0200 |
| commit | 0fd3d902d920f3e60f88530c33f1ae7581260951 (patch) | |
| tree | 750329558753f14845c5d02caf15db166ba7dfb8 /board/etin | |
| parent | 5168801f4b71c2f8dcd92a80cfcfda84246e67fe (diff) | |
| download | talos-obmc-uboot-0fd3d902d920f3e60f88530c33f1ae7581260951.tar.gz talos-obmc-uboot-0fd3d902d920f3e60f88530c33f1ae7581260951.zip | |
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>
Diffstat (limited to 'board/etin')
| -rw-r--r-- | 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 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; |
