Merge with git://www.denx.de/git/u-boot.git

[karo-tx-uboot.git] / rtc / ds1556.c

diff --git a/rtc/ds1556.c b/rtc/ds1556.c
index dd9ea5ef8099c199095ad131c7f41634d5e044b4..4365cfb9813c39ba36faf45c84b88ba1d7e19187 100644 (file)
--- a/rtc/ds1556.c
+++ b/rtc/ds1556.c
@@ -37,7 +37,7 @@
 #include <rtc.h>
 
 
-#if defined(CONFIG_RTC_DS1556) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS1556) && defined(CONFIG_CMD_DATE)
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);
@@ -203,4 +203,4 @@ static unsigned char bin2bcd (unsigned int n)
        return (((n / 10) << 4) | (n % 10));
 }
 
-#endif /* CONFIG_RTC_DS1556 && CFG_CMD_DATE */
+#endif