summaryrefslogtreecommitdiff
path: root/rtc/max6900.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-14 14:36:29 (GMT)
committerStefan Roese <sr@denx.de>2007-08-14 14:36:29 (GMT)
commit3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch)
treefb66bf8861d9f78765160d734a438856f5317cdb /rtc/max6900.c
parent4ce846ec59f36b85d6644a769690ad3feb667575 (diff)
parent4ef35e53c693556c54b0c22d6f873de87bade253 (diff)
downloadu-boot-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.xz
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'rtc/max6900.c')
-rw-r--r--rtc/max6900.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rtc/max6900.c b/rtc/max6900.c
index 73919cd..c75a8e0 100644
--- a/rtc/max6900.c
+++ b/rtc/max6900.c
@@ -32,7 +32,7 @@
#include <rtc.h>
#include <i2c.h>
-#if defined(CONFIG_RTC_MAX6900) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_MAX6900) && defined(CONFIG_CMD_DATE)
#ifndef CFG_I2C_RTC_ADDR
#define CFG_I2C_RTC_ADDR 0x50
@@ -128,4 +128,4 @@ void rtc_reset (void)
{
}
-#endif /* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */
+#endif