diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
| commit | b4f15fdaf77b7339e2984703c83269c7cdf680a9 (patch) | |
| tree | 32bb3b65d98a229aead643ae11ef2dc433146411 /cpu/mpc85xx/serial_scc.c | |
| parent | b20d00328c5486a4b2cdf07ce7afaf2139dc741e (diff) | |
| parent | 07a2505f67e091ff70506ae6a5022b416211df44 (diff) | |
Merge with /home/wd/git/u-boot/jon_loeliger
Diffstat (limited to 'cpu/mpc85xx/serial_scc.c')
| -rw-r--r-- | cpu/mpc85xx/serial_scc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc85xx/serial_scc.c b/cpu/mpc85xx/serial_scc.c index ea82761465..cf060d6890 100644 --- a/cpu/mpc85xx/serial_scc.c +++ b/cpu/mpc85xx/serial_scc.c @@ -35,7 +35,7 @@ #include <common.h> #include <asm/cpm_85xx.h> -#if defined(CONFIG_MPC8560) +#if defined(CONFIG_CPM2) #if defined(CONFIG_CONS_ON_SCC) #if CONFIG_CONS_INDEX == 1 /* Console on SCC1 */ @@ -271,4 +271,4 @@ serial_tstc() #endif /* CONFIG_CONS_ON_SCC */ -#endif /* CONFIG_MPC8560 */ +#endif /* CONFIG_CPM2 */ |