Merge branch 'master' of git://git.denx.de/u-boot-samsung

[karo-tx-uboot.git] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index 6718648d4e8b927f0d9e1c170f7c1df025c805c1..1345c08aefd6d68f9b05e1e926fe4463abd7abf4 100644 (file)
--- 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);