Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / drivers / serial / serial_s3c44b0.c

diff --git a/drivers/serial/serial_s3c44b0.c b/drivers/serial/serial_s3c44b0.c
index 8beba1abc8235f1d5c1820e2ff0459ad3241b550..9cae843088aaa570bbf14a76b1d74fbc333c319d 100644 (file)
--- a/drivers/serial/serial_s3c44b0.c
+++ b/drivers/serial/serial_s3c44b0.c
@@ -209,21 +209,13 @@ static int s3c44b0_serial_getc(void)
        }
 }
 
-static void s3c44b0_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device s3c44b0_serial_drv = {
        .name   = "s3c44b0_serial",
        .start  = s3c44b0_serial_init,
        .stop   = NULL,
        .setbrg = s3c44b0_serial_setbrg,
        .putc   = s3c44b0_serial_putc,
-       .puts   = s3c44b0_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = s3c44b0_serial_getc,
        .tstc   = s3c44b0_serial_tstc,
 };
@@ -237,34 +229,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &s3c44b0_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return s3c44b0_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       s3c44b0_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       s3c44b0_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       s3c44b0_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return s3c44b0_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return s3c44b0_serial_tstc();
-}
-#endif