From 121a2df636d4dc31b889f685139fc6d2876fc8ae Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 25 May 2010 23:51:17 -0700
Subject: [PATCH] --- yaml --- r: 201128 b: refs/heads/master c:
 7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/serial/suncore.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 956ecf9c5751..d1152d297a85 100644
--- 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
index ed7d958b0a01..544f2e25d0e5 100644
--- 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;
 }