diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
| commit | 3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch) | |
| tree | fb66bf8861d9f78765160d734a438856f5317cdb /rtc/mpc8xx.c | |
| parent | 4ce846ec59f36b85d6644a769690ad3feb667575 (diff) | |
| parent | 4ef35e53c693556c54b0c22d6f873de87bade253 (diff) | |
| download | olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.xz olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'rtc/mpc8xx.c')
| -rw-r--r-- | rtc/mpc8xx.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/rtc/mpc8xx.c b/rtc/mpc8xx.c index 830e56e17..8d10c0e46 100644 --- a/rtc/mpc8xx.c +++ b/rtc/mpc8xx.c @@ -31,7 +31,7 @@  #include <command.h>  #include <rtc.h> -#if defined(CONFIG_RTC_MPC8xx) && (CONFIG_COMMANDS & CFG_CMD_DATE) +#if defined(CONFIG_RTC_MPC8xx) && defined(CONFIG_CMD_DATE)  /* ------------------------------------------------------------------------- */ @@ -70,6 +70,4 @@ void rtc_reset (void)  	return;	/* nothing to do */  } -/* ------------------------------------------------------------------------- */ - -#endif	/* CONFIG_RTC_MPC8xx && CFG_CMD_DATE */ +#endif |