Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[~andy/linux] / arch / mips / alchemy / devboards / platform.c

diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c
index f39042e99d0d45626305a34135e4d8d0f9c01ac4..8df86eb94972e06c14971b21f565d241c43313d5 100644 (file)
--- a/arch/mips/alchemy/devboards/platform.c
+++ b/arch/mips/alchemy/devboards/platform.c
@@ -36,11 +36,10 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-#ifdef CONFIG_MIPS_DB1300
-       alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
-#else
-       alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
-#endif
+       if (alchemy_get_cputype() == ALCHEMY_CPU_AU1300)
+               alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
+       else
+               alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }