diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
| commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
| tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /rtc/s3c24x0_rtc.c | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
| download | olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.xz olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'rtc/s3c24x0_rtc.c')
| -rw-r--r-- | rtc/s3c24x0_rtc.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/rtc/s3c24x0_rtc.c b/rtc/s3c24x0_rtc.c index 9e2191e87..7f8b4fad0 100644 --- a/rtc/s3c24x0_rtc.c +++ b/rtc/s3c24x0_rtc.c @@ -28,7 +28,7 @@  #include <common.h>  #include <command.h> -#if defined(CONFIG_RTC_S3C24X0) && (CONFIG_COMMANDS & CFG_CMD_DATE) +#if defined(CONFIG_RTC_S3C24X0) && (defined(CONFIG_CMD_DATE))  #if defined(CONFIG_S3C2400)  #include <s3c2400.h> @@ -175,6 +175,4 @@ void rtc_reset (void)  	rtc->RTCCON &= ~(0x08|0x01);  } -/* ------------------------------------------------------------------------- */ - -#endif	/* CONFIG_RTC_S3C24X0 && CFG_CMD_DATE */ +#endif |