diff options
author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 |
commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /rtc/ds164x.c | |
parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
download | talos-obmc-uboot-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.gz talos-obmc-uboot-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'rtc/ds164x.c')
-rw-r--r-- | rtc/ds164x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rtc/ds164x.c b/rtc/ds164x.c index 3cc76aba00..bff22b9a05 100644 --- a/rtc/ds164x.c +++ b/rtc/ds164x.c @@ -37,7 +37,7 @@ #include <rtc.h> -#if defined(CONFIG_RTC_DS164x) && (CONFIG_COMMANDS & CFG_CMD_DATE) +#if defined(CONFIG_RTC_DS164x) && defined(CONFIG_CMD_DATE) static uchar rtc_read(unsigned int addr ); static void rtc_write(unsigned int addr, uchar val); @@ -197,4 +197,4 @@ static unsigned char bin2bcd (unsigned int n) return (((n / 10) << 4) | (n % 10)); } -#endif /* CONFIG_RTC_DS164x && CFG_CMD_DATE */ +#endif |