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/mc146818.c | |
parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'rtc/mc146818.c')
-rw-r--r-- | rtc/mc146818.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rtc/mc146818.c b/rtc/mc146818.c index 20b1b3e7702..ab377ed73e5 100644 --- a/rtc/mc146818.c +++ b/rtc/mc146818.c @@ -31,7 +31,7 @@ #include <command.h> #include <rtc.h> -#if defined(CONFIG_RTC_MC146818) && (CONFIG_COMMANDS & CFG_CMD_DATE) +#if defined(CONFIG_RTC_MC146818) && defined(CONFIG_CMD_DATE) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -175,4 +175,4 @@ static unsigned char bin2bcd (unsigned int n) return (((n / 10) << 4) | (n % 10)); } -#endif /* CONFIG_RTC_MC146818 && CFG_CMD_DATE */ +#endif |