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

[u-boot] / board / cogent / serial.c

diff --git a/board/cogent/serial.c b/board/cogent/serial.c
index cd4a976f89e23b4da23e84c58f1d8502802e6c84..95c81207225e815205d91bb955a36eb7bafee6d0 100644 (file)
--- a/board/cogent/serial.c
+++ b/board/cogent/serial.c
@@ -4,7 +4,7 @@
  */
 
 #include <common.h>
-#include <board/cogent/serial.h>
+#include "serial.h"
 #include <serial.h>
 #include <linux/compiler.h>
 
@@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if (CMA_MB_CAPS & CMA_MB_CAP_SERPAR)
 
 #if (defined(CONFIG_8xx) && defined(CONFIG_8xx_CONS_NONE)) || \
-     (defined(CONFIG_8260) && defined(CONFIG_CONS_NONE))
+       (defined(CONFIG_MPC8260) && defined(CONFIG_CONS_NONE))
 
 #if CONFIG_CONS_INDEX == 1
 #define CMA_MB_SERIAL_BASE     CMA_MB_SERIALA_BASE
@@ -68,12 +68,6 @@ static void cogent_serial_putc(const char c)
        cma_mb_reg_write (&mbsp->ser_thr, c);
 }
 
-static void cogent_serial_puts(const char *s)
-{
-       while (*s != '\0')
-               serial_putc (*s++);
-}
-
 static int cogent_serial_getc(void)
 {
        cma_mb_serial *mbsp = (cma_mb_serial *) CMA_MB_SERIAL_BASE;
@@ -96,7 +90,7 @@ static struct serial_device cogent_serial_drv = {
        .stop   = NULL,
        .setbrg = cogent_serial_setbrg,
        .putc   = cogent_serial_putc,
-       .puts   = cogent_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = cogent_serial_getc,
        .tstc   = cogent_serial_tstc,
 };