diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
commit | f0e3d2b42268a9ed8d28c50c662eeba08379ceab (patch) | |
tree | ac713d8a69dee7e80af82ff3b3d5b6b3062c5ee7 /common/serial.c | |
parent | 386eda022473394ad8f36b86f2bdc9b4cb816291 (diff) | |
parent | f73e73ba0e422e6f79030d77286dd57becaee16f (diff) |
Merge with /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 2acbd08b16..7b29951708 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 |