diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
| commit | 375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch) | |
| tree | c8499eaec089c8fe7c9eda562131f45b4a7738c6 /rtc/max6900.c | |
| parent | f0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.gz u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.bz2 | |
Merge commit 'upstream/master'
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 |