X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fmips%2Fcobalt%2Fconsole.c;h=d1ba701c9dd195fdcfaf9a2bea47f81703450260;hb=626a16c16e13e4afaba382bfc0354a3555f5231c;hp=ca56b415b8ac30c3e6b45a7c02767a9226e12ce1;hpb=c207908fcc451e31d7fbba31541bd04f93787eb4;p=linux-2.6

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index ca56b415b8..d1ba701c9d 100644
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,18 +1,20 @@
 /*
  * (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>
+
+#include <cobalt.h>
+
+#define UART_BASE	((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
-	while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
+	if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
+		return;
+
+	while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
 		;
 
-	COBALT_UART[UART_TX] = c;
+	writeb(c, UART_BASE + UART_TX);
 }