summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-04 22:49:15 +0200
committerWolfgang Denk <wd@denx.de>2010-05-04 22:49:15 +0200
commit900a1fe8c8c7acda1d8903af02c2d0d993b770d8 (patch)
treeb17bb283aa7fe7b31f46fbdfd3496b7f23736840 /common
parent4185ae7a7146a77a792e5ba49845e5ca6e95b038 (diff)
parent20d98c2cea3398ad93beccd4727a371f41514086 (diff)
downloadu-boot-imx-900a1fe8c8c7acda1d8903af02c2d0d993b770d8.zip
u-boot-imx-900a1fe8c8c7acda1d8903af02c2d0d993b770d8.tar.gz
u-boot-imx-900a1fe8c8c7acda1d8903af02c2d0d993b770d8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
-rw-r--r--common/serial.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/common/serial.c b/common/serial.c
index 754e329..0682faa 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -79,13 +79,13 @@ struct serial_device *__default_serial_console (void)
#endif
#elif defined(CONFIG_S5PC1XX)
#if defined(CONFIG_SERIAL0)
- return &s5pc1xx_serial0_device;
+ return &s5p_serial0_device;
#elif defined(CONFIG_SERIAL1)
- return &s5pc1xx_serial1_device;
+ return &s5p_serial1_device;
#elif defined(CONFIG_SERIAL2)
- return &s5pc1xx_serial2_device;
+ return &s5p_serial2_device;
#elif defined(CONFIG_SERIAL3)
- return &s5pc1xx_serial3_device;
+ return &s5p_serial3_device;
#else
#error "CONFIG_SERIAL? missing."
#endif
@@ -162,10 +162,10 @@ void serial_initialize (void)
serial_register(&s3c24xx_serial2_device);
#endif
#if defined(CONFIG_S5PC1XX)
- serial_register(&s5pc1xx_serial0_device);
- serial_register(&s5pc1xx_serial1_device);
- serial_register(&s5pc1xx_serial2_device);
- serial_register(&s5pc1xx_serial3_device);
+ serial_register(&s5p_serial0_device);
+ serial_register(&s5p_serial1_device);
+ serial_register(&s5p_serial2_device);
+ serial_register(&s5p_serial3_device);
#endif
#if defined(CONFIG_MPC512X)
#if defined(CONFIG_SYS_PSC1)