diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
commit | c60ecec67ab3f6b5791ef49d502b7a61909aa13e (patch) | |
tree | e8180ad2ec48a6063277ee51cf10dc8541dcac2f /arch/mips/cobalt | |
parent | Revert "writeback: introduce writeback_control.more_io to indicate more io" (diff) | |
parent | [MIPS] Cacheops.h: Fix typo. (diff) | |
download | linux-dev-c60ecec67ab3f6b5791ef49d502b7a61909aa13e.tar.xz linux-dev-c60ecec67ab3f6b5791ef49d502b7a61909aa13e.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cacheops.h: Fix typo.
[MIPS] Cobalt: Qube1 has no serial port so don't use it
[MIPS] Cobalt: Fix ethernet interrupts for RaQ1
[MIPS] Kconfig fixes for BCM47XX platform
Diffstat (limited to 'arch/mips/cobalt')
-rw-r--r-- | arch/mips/cobalt/console.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c index db330e811025..d1ba701c9dd1 100644 --- 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)) ; |