Merge branch 'patman' of git://git.denx.de/u-boot-x86

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

diff --git a/drivers/serial/serial_sa1100.c b/drivers/serial/serial_sa1100.c
index 86e682d44d4aa788a081275895b43b5b2d5b0b1e..3c0f4c59fb47e8c0f8bf354e0090745cb43a8356 100644 (file)
--- a/drivers/serial/serial_sa1100.c
+++ b/drivers/serial/serial_sa1100.c
@@ -153,21 +153,13 @@ static int sa1100_serial_getc(void)
 #endif
 }
 
-static void sa1100_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device sa1100_serial_drv = {
        .name   = "sa1100_serial",
        .start  = sa1100_serial_init,
        .stop   = NULL,
        .setbrg = sa1100_serial_setbrg,
        .putc   = sa1100_serial_putc,
-       .puts   = sa1100_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = sa1100_serial_getc,
        .tstc   = sa1100_serial_tstc,
 };
@@ -181,34 +173,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &sa1100_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return sa1100_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       sa1100_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       sa1100_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       sa1100_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return sa1100_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return sa1100_serial_tstc();
-}
-#endif