Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / board / Marvell / common / serial.c

diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index 1327c62a75af7fa23c1c65ad6e601fd4c53ccceb..4a780c3746bd591cd6de6a2bf12d59e5de4d154a 100644 (file)
--- a/board/Marvell/common/serial.c
+++ b/board/Marvell/common/serial.c
@@ -139,20 +139,13 @@ static void marvell_serial_setbrg(void)
 
 #endif /* CONFIG_MPSC */
 
-static void marvell_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
 static struct serial_device marvell_serial_drv = {
        .name   = "marvell_serial",
        .start  = marvell_serial_init,
        .stop   = NULL,
        .setbrg = marvell_serial_setbrg,
        .putc   = marvell_serial_putc,
-       .puts   = marvell_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = marvell_serial_getc,
        .tstc   = marvell_serial_tstc,
 };