summaryrefslogtreecommitdiffstats
path: root/arch/mips/boot/compressed
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-01-11 15:42:10 +0100
committerRalf Baechle <ralf@linux-mips.org>2012-01-11 15:42:10 +0100
commit7a5c3b8c5c27211846efe7029a3d2ee7087425e3 (patch)
tree92530366912b64c2826a882a79ebcfbe6ec28d59 /arch/mips/boot/compressed
parentMerge branch 'next/generic' into mips-for-linux-next (diff)
parentMIPS: Alchemy: Update cpu-feature-overrides (diff)
downloadlinux-7a5c3b8c5c27211846efe7029a3d2ee7087425e3.tar.xz
linux-7a5c3b8c5c27211846efe7029a3d2ee7087425e3.zip
Merge branch 'next/alchemy' into mips-for-linux-next
Diffstat (limited to 'arch/mips/boot/compressed')
-rw-r--r--arch/mips/boot/compressed/uart-alchemy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c
index eb063e6dead9..3112df8f90db 100644
--- a/arch/mips/boot/compressed/uart-alchemy.c
+++ b/arch/mips/boot/compressed/uart-alchemy.c
@@ -2,6 +2,9 @@
void putc(char c)
{
- /* all current (Jan. 2010) in-kernel boards */
+#ifdef CONFIG_MIPS_DB1300
+ alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
+#else
alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
+#endif
}