diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
| commit | 09b4a9cf4003599f2cd609587dfa5f0b754640ed (patch) | |
| tree | 768c7e70dc393814643ed7b7290ea8e33fa95ba3 /common | |
| parent | 27130f133eda205b07d97b475a2ef96ec3f46b0f (diff) | |
| parent | a87bc64cb4311323f592265541ced6ec9171d4d6 (diff) | |
| download | u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.zip u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.gz u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'common')
| -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 6718648..1345c08 100644 --- a/common/serial.c +++ b/common/serial.c @@ -78,7 +78,7 @@ struct serial_device *__default_serial_console (void) #else #error "CONFIG_SERIAL? missing." #endif -#elif defined(CONFIG_S5PC1XX) +#elif defined(CONFIG_S5P) #if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -162,7 +162,7 @@ void serial_initialize (void) serial_register(&s3c24xx_serial1_device); serial_register(&s3c24xx_serial2_device); #endif -#if defined(CONFIG_S5PC1XX) +#if defined(CONFIG_S5P) serial_register(&s5p_serial0_device); serial_register(&s5p_serial1_device); serial_register(&s5p_serial2_device); |