From 6c0a1e9d1047ddaffbf7c8ca59e12bd2d8da46a1 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Tue, 2 Oct 2007 23:13:17 +0900
Subject: [PATCH] --- yaml --- r: 66195 b: refs/heads/master c:
 5a860424a1bcf21655d993a7c09b36662e34d2a9 h: refs/heads/master i:   66193:
 fb97594362bb2df7cb28487d566b54a14bc7f20f   66191:
 e35c3990305f21fa17a7f426c420bd74eafe8455 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/cobalt/console.c            | 9 ++++-----
 trunk/include/asm-mips/mach-cobalt/cobalt.h | 2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index fd32b7ba0204..fc93c4a70594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4126e86301cfc6863cbc74bc4500a88b7c582df
+refs/heads/master: 5a860424a1bcf21655d993a7c09b36662e34d2a9
diff --git a/trunk/arch/mips/cobalt/console.c b/trunk/arch/mips/cobalt/console.c
index 0485d51f7216..db330e811025 100644
--- a/trunk/arch/mips/cobalt/console.c
+++ b/trunk/arch/mips/cobalt/console.c
@@ -1,16 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
+#include <linux/io.h>
 #include <linux/serial_reg.h>
 
-#include <asm/addrspace.h>
-
-#include <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);
 }
diff --git a/trunk/include/asm-mips/mach-cobalt/cobalt.h b/trunk/include/asm-mips/mach-cobalt/cobalt.h
index f27fcef3e3ff..4cb5844d42df 100644
--- a/trunk/include/asm-mips/mach-cobalt/cobalt.h
+++ b/trunk/include/asm-mips/mach-cobalt/cobalt.h
@@ -39,6 +39,4 @@ extern int cobalt_board_id;
 # define COBALT_KEY_SELECT	(1 << 7)
 # define COBALT_KEY_MASK	0xfe
 
-#define COBALT_UART		((volatile unsigned char *) CKSEG1ADDR(0x1c800000))
-
 #endif /* __ASM_COBALT_H */