---

yaml --- r: 201128 b: refs/heads/master c: 7c1f6af h: refs/heads/master v: v3
git-mirror · May 26, 2010 · 121a2df · 121a2df
1 parent b6f7eb5
commit 121a2df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c87fe1c05d57e3fecd62e56da1b1ac4291116ebf
+refs/heads/master: 7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e
diff --git a/trunk/drivers/serial/suncore.c b/trunk/drivers/serial/suncore.c
@@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
 
 	con->index = line;
 	drv->cons = con;
-	add_preferred_console(con->name, line, NULL);
+
+	if (!console_set_on_cmdline)
+		add_preferred_console(con->name, line, NULL);
 
 	return 1;
 }