summaryrefslogtreecommitdiff
path: root/rtc/ds174x.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
committerMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
commit85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch)
tree3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /rtc/ds174x.c
parent706714d97a0d08d59eda4de2268c39f504688329 (diff)
parentb23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff)
downloadolio-uboot-2014.01-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.xz
olio-uboot-2014.01-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'rtc/ds174x.c')
-rw-r--r--rtc/ds174x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rtc/ds174x.c b/rtc/ds174x.c
index 58b13e9da..5f85a6817 100644
--- a/rtc/ds174x.c
+++ b/rtc/ds174x.c
@@ -33,7 +33,7 @@
#include <command.h>
#include <rtc.h>
-#if defined(CONFIG_RTC_DS174x) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS174x) && defined(CONFIG_CMD_DATE)
static uchar rtc_read( unsigned int addr );
static void rtc_write( unsigned int addr, uchar val);
@@ -199,4 +199,4 @@ static unsigned char bin2bcd (unsigned int n)
return (((n / 10) << 4) | (n % 10));
}
-#endif /* CONFIG_RTC_MC146818 && CFG_CMD_DATE */
+#endif