diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-20 00:10:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-20 00:10:07 +0200 |
| commit | b18815752f3d6db27877606e4e069e3f6cfe3a19 (patch) | |
| tree | 6c020a953e33ff48304d94f3ec586431321cd147 /common/serial.c | |
| parent | 683e9f1ea5586d7538c9afa397a0a86ccfb21bff (diff) | |
| parent | 2ea88b063e1547ff013b00e74a4656603be5ed5f (diff) | |
| download | u-boot-imx-b18815752f3d6db27877606e4e069e3f6cfe3a19.zip u-boot-imx-b18815752f3d6db27877606e4e069e3f6cfe3a19.tar.gz u-boot-imx-b18815752f3d6db27877606e4e069e3f6cfe3a19.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/serial.c b/common/serial.c index 7bebc12..c3323ea 100644 --- a/common/serial.c +++ b/common/serial.c @@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR; static struct serial_device *serial_devices = NULL; static struct serial_device *serial_current = NULL; -#if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA27X) +#if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA250) && !defined(CONFIG_PXA27X) struct serial_device *__default_serial_console (void) { #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) |