2 files changed, 4 insertions, 7 deletions

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 0485d51f7216..db330e811025 100644
--- a/arch/mips/cobalt/console.c
+++ b/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/include/asm-mips/mach-cobalt/cobalt.h b/include/asm-mips/mach-cobalt/cobalt.h
index f27fcef3e3ff..4cb5844d42df 100644
--- a/include/asm-mips/mach-cobalt/cobalt.h
+++ b/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 */