diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-24 14:11:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 14:11:40 -0800 |
| commit | 1917d17b903955b8b2903626a2e01d071a5d0ec9 (patch) | |
| tree | 40693027529857e0f6067d692df1c98b7f750601 /drivers/serial/sunsu.c | |
| parent | 457931de3b0925dc2eb941bc7d611a509be36dff (diff) | |
| download | linux-1917d17b903955b8b2903626a2e01d071a5d0ec9.tar.bz2 | |
sunsu: Pass true 'ignore_line' to console match when RSC or LOM console.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/sunsu.c')
| -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 4868b318e55e..4ee4167c662f 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; |