From 17c11290a85606a80545b40505262233069d4eee Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@gmail.com>
Date: Sun, 13 Nov 2005 23:27:46 +0200
Subject: [PATCH] --- yaml --- r: 14335 b: refs/heads/master c:
 b60ccd575c2d96041b856aad19a7d3af168d79b9 h: refs/heads/master i:   14333:
 dd98b8a6a9c05db4d609b0b4a30291d3463fb293   14331:
 8cb77530ea3100d84ed81b50d9203e197c20855d   14327:
 771b6bb3cd710f16afe41565b05f66d7f2242f0c   14319:
 e4bdebb1f661836dd87d86e06c130dd5b7cb84f8   14303:
 6be6a6f01afc33ccc0de878252dd8c99eec9018f   14271:
 75a191f37f9ee597c5d2ed03dfb3943768e0bf83   14207:
 66c348e474cbd0f73df185e37c19199eda224b22   14079:
 23f3a82998912654be41bbbb9048ca6ae1d15ece   13823:
 203f78dc92c2a095eaf29ba80f6d3b8442cb654a   13311:
 8c11522a0a0cb5828a63314d307d345faaa8c193   12287:
 bd96c6237ab7f45251157c831d903d96fdddbcc0 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/au1000/common/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea9dd10629c8..39d44b5a43eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10d14ddec8daf11a298f05ab3d644887df39830
+refs/heads/master: b60ccd575c2d96041b856aad19a7d3af168d79b9
diff --git a/trunk/arch/mips/au1000/common/setup.c b/trunk/arch/mips/au1000/common/setup.c
index 4f21f42d096b..08c8c855cc9c 100644
--- a/trunk/arch/mips/au1000/common/setup.c
+++ b/trunk/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");