From: Pantelis Antoniou <pantelis.antoniou@gmail.com>
Date: Sun, 13 Nov 2005 21:27:46 +0000 (+0200)
Subject: [MIPS] Alchemy: Console output fixup
X-Git-Tag: v2.6.15-rc2~65^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b60ccd575c2d96041b856aad19a7d3af168d79b9;p=linux-2.6

[MIPS] Alchemy: Console output fixup

This is needed to make console output appear with the new driver...

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 4f21f42d09..08c8c855cc 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -93,7 +93,7 @@ void __init plat_setup(void)
 
 	argptr = prom_getcmdline();
 
-#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
+#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 	if ((argptr = strstr(argptr, "console=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " console=ttyS0,115200");