diff options
author | Stefan Roese <sr@denx.de> | 2007-08-15 19:06:27 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-15 19:06:27 (GMT) |
commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /rtc/max6900.c | |
parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
download | u-boot-fsl-qoriq-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz |
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 |