Merge branch 'for-3.13/core' into for-next

[karo-tx-linux.git] / arch / mips / cobalt / console.c

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index db330e811025d36cf9a33a1b2a2c6d169d1a9e23..d1ba701c9dd195fdcfaf9a2bea47f81703450260 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -4,10 +4,15 @@
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 
+#include <cobalt.h>
+
 #define UART_BASE      ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
+       if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
+               return;
+
        while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
                ;