Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild

[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 ca56b415b8ac30c3e6b45a7c02767a9226e12ce1..db330e811025d36cf9a33a1b2a2c6d169d1a9e23 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,18 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/console.h>
+#include <linux/io.h>
 #include <linux/serial_reg.h>
-#include <asm/addrspace.h>
-#include <asm/mach-cobalt/cobalt.h>
+
+#define UART_BASE      ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
-       while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
+       while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
                ;
 
-       COBALT_UART[UART_TX] = c;
+       writeb(c, UART_BASE + UART_TX);
 }