diff options
author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /cpu/ppc4xx/cpu_init.c | |
parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'cpu/ppc4xx/cpu_init.c')
-rw-r--r-- | cpu/ppc4xx/cpu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index ae245910872..82ae4434b0b 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -314,7 +314,7 @@ cpu_init_f (void) #endif #if defined (CFG_EBC_CFG) - mtebc(epcr, CFG_EBC_CFG); + mtebc(EBC0_CFG, CFG_EBC_CFG); #endif #if defined(CONFIG_WATCHDOG) |