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

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

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index d2eb7520d03886748c7d0130a0851c51eca8d997..18e41b2302a2181ba6f38c53ecc71c682fb5cad0 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -254,28 +254,28 @@ void serial_initialize(void)
        serial_assign(default_serial_console()->name);
 }
 
-int serial_stub_start(struct stdio_dev *sdev)
+static int serial_stub_start(struct stdio_dev *sdev)
 {
        struct serial_device *dev = sdev->priv;
 
        return dev->start();
 }
 
-int serial_stub_stop(struct stdio_dev *sdev)
+static int serial_stub_stop(struct stdio_dev *sdev)
 {
        struct serial_device *dev = sdev->priv;
 
        return dev->stop();
 }
 
-void serial_stub_putc(struct stdio_dev *sdev, const char ch)
+static void serial_stub_putc(struct stdio_dev *sdev, const char ch)
 {
        struct serial_device *dev = sdev->priv;
 
        dev->putc(ch);
 }
 
-void serial_stub_puts(struct stdio_dev *sdev, const char *str)
+static void serial_stub_puts(struct stdio_dev *sdev, const char *str)
 {
        struct serial_device *dev = sdev->priv;
 
@@ -320,6 +320,7 @@ void serial_stdio_init(void)
                dev.puts = serial_stub_puts;
                dev.getc = serial_stub_getc;
                dev.tstc = serial_stub_tstc;
+               dev.priv = s;
 
                stdio_register(&dev);