diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-26 08:51:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-26 08:51:17 +0200 |
| commit | 7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e (patch) | |
| tree | 36393bfe9287b99b19f437ac01f43750e293e61e /drivers | |
| parent | sparc32: Kill none_mask, it's bogus. (diff) | |
| download | linux-7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e.tar.xz linux-7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e.zip | |
sunserial: Don't call add_preferred_console() when console= is specified.
Reported-by: Frans Pop <elendil@planet.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/suncore.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index ed7d958b0a01..544f2e25d0e5 100644 --- a/drivers/serial/suncore.c +++ b/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; } |