summaryrefslogtreecommitdiff
path: root/drivers/serial/mcfuart.c
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2012-11-10 08:05:54 +0100
committerStefano Babic <sbabic@denx.de>2012-11-10 08:05:54 +0100
commit3e4d27b06d7484040355e22eec2cbce7335d6dab (patch)
tree9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /drivers/serial/mcfuart.c
parentbad05afe083eec0467220de21683443292c5012e (diff)
parent59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff)
downloadolio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz
olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip
Merge git://git.denx.de/u-boot
Diffstat (limited to 'drivers/serial/mcfuart.c')
-rw-r--r--drivers/serial/mcfuart.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c
index 00a711469..7e2579766 100644
--- a/drivers/serial/mcfuart.c
+++ b/drivers/serial/mcfuart.c
@@ -28,6 +28,8 @@
*/
#include <common.h>
+#include <serial.h>
+#include <linux/compiler.h>
#include <asm/immap.h>
#include <asm/uart.h>
@@ -87,13 +89,6 @@ static void mcf_serial_putc(const char c)
uart->utb = c;
}
-static void mcf_serial_puts(const char *s)
-{
- while (*s) {
- serial_putc(*s++);
- }
-}
-
static int mcf_serial_getc(void)
{
volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE);
@@ -136,7 +131,7 @@ static struct serial_device mcf_serial_drv = {
.stop = NULL,
.setbrg = mcf_serial_setbrg,
.putc = mcf_serial_putc,
- .puts = mcf_serial_puts,
+ .puts = default_serial_puts,
.getc = mcf_serial_getc,
.tstc = mcf_serial_tstc,
};