diff options
author | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
commit | a650cfa286e8933144a776693d56dfd858922aa4 (patch) | |
tree | 1848c6ba3c8115b516d6711cad787d1e6a9d2fb5 /common/serial.c | |
parent | df02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff) | |
parent | 0c32d96ddd7309b86ff92dfc1f3694908f174cf6 (diff) | |
download | u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.zip u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.gz u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.bz2 |
Merge with ssh://fifi/home/wd/git/u-boot/master
Diffstat (limited to 'common/serial.c')
-rw-r--r-- | common/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/serial.c b/common/serial.c index 2acbd08..7b29951 100644 --- a/common/serial.c +++ b/common/serial.c @@ -41,7 +41,7 @@ struct serial_device *default_serial_console (void) || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ - || defined(CONFIG_405EP) + || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) return &serial0_device; #else #error No default console @@ -75,7 +75,7 @@ void serial_initialize (void) #endif #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ - || defined(CONFIG_405EP) + || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) serial_register(&serial0_device); serial_register(&serial1_device); #endif |