diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-24 14:11:40 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-18 13:44:05 -0800 |
| commit | 7e75549c4c038ed122b885316a42da25eb0dff79 (patch) | |
| tree | acf380989ec9858d3e7b57a736e7d979c16c291a /drivers | |
| parent | d96dc1bbc3a283da689c2ffd3c285056749c1956 (diff) | |
sunsu: Pass true 'ignore_line' to console match when RSC or LOM console.
[ Upstream commit 1917d17b903955b8b2903626a2e01d071a5d0ec9 ]
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sunsu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 911354ef393..b35d13e89eb 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1409,6 +1409,7 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m struct uart_sunsu_port *up; struct resource *rp; enum su_type type; + bool ignore_line; int err; type = su_get_type(dp); @@ -1467,9 +1468,14 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m up->port.ops = &sunsu_pops; + ignore_line = false; + if (!strcmp(dp->name, "rsc-console") || + !strcmp(dp->name, "lom-console")) + ignore_line = true; + sunserial_console_match(SUNSU_CONSOLE(), dp, &sunsu_reg, up->port.line, - false); + ignore_line); err = uart_add_one_port(&sunsu_reg, &up->port); if (err) goto out_unmap; |