diff options
author | Markus Klotzbuecher <mk@denx.de> | 2007-08-07 22:30:29 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-08-07 22:30:29 +0200 |
commit | 78549bbf44bd2c8d1a0730fb068836071751afaa (patch) | |
tree | 92f002dc9772874bc3c884b1caa5607763c2c276 /rtc/max6900.c | |
parent | 9b7464a2c88614e1061f509c48930a3d240d1a35 (diff) | |
parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
download | u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.zip u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.gz u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'rtc/max6900.c')
-rw-r--r-- | rtc/max6900.c | 4 |
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 |