---

yaml --- r: 14335 b: refs/heads/master c: b60ccd5 h: refs/heads/master i: 14333: dd98b8a 14331: 8cb7753 14327: 771b6bb 14319: e4bdebb 14303: 6be6a6f 14271: 75a191f 14207: 66c348e 14079: 23f3a82 13823: 203f78d 13311: 8c11522 12287: bd96c62 v: v3
git-mirror · Nov 17, 2005 · 17c1129 · 17c1129
1 parent efd9549
commit 17c1129
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");