Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6-omap-h63xx.git] / arch / mips / cobalt / console.c

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index fff20d28114fe893c3dbd0adcabd4f3a61b5f8d1..0485d51f72165169190bd1895526581fd4eb35c5 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,19 +1,14 @@
 /*
  * (C) P. Horton 2006
  */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/console.h>
 #include <linux/serial_reg.h>
+
 #include <asm/addrspace.h>
-#include <asm/mach-cobalt/cobalt.h>
 
-static void putchar(int c)
-{
-       if(c == '\n')
-               putchar('\r');
+#include <cobalt.h>
 
+void prom_putchar(char c)
+{
        while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
                ;