diff options
author | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
commit | 4b326101d6cfaeab8250988bc4c7f51e6c92d719 (patch) | |
tree | d04632af08591263f5cd6fc8a5c6ba8ac3d6d246 /cpu/mcf5445x/cpu_init.c | |
parent | 69e2c6d0d13d7c8cf1612ac090bdc4c59ba6858e (diff) | |
parent | d5996dd555edf52721b7691a4c59de016251ed39 (diff) | |
download | u-boot-imx-4b326101d6cfaeab8250988bc4c7f51e6c92d719.zip u-boot-imx-4b326101d6cfaeab8250988bc4c7f51e6c92d719.tar.gz u-boot-imx-4b326101d6cfaeab8250988bc4c7f51e6c92d719.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'cpu/mcf5445x/cpu_init.c')
-rw-r--r-- | cpu/mcf5445x/cpu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mcf5445x/cpu_init.c b/cpu/mcf5445x/cpu_init.c index 585216d..e07748b 100644 --- a/cpu/mcf5445x/cpu_init.c +++ b/cpu/mcf5445x/cpu_init.c @@ -110,7 +110,7 @@ void cpu_init_f(void) */ int cpu_init_r(void) { -#ifdef CONFIG_MCFTMR +#ifdef CONFIG_MCFRTC volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE); volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended; |