diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-24 14:03:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 14:03:34 -0800 |
| commit | 4e3533d05b6e5e66d1cda27f6671251c99c62894 (patch) | |
| tree | 0eed98a48ff54e7fbdeb51227ed95f1b4774e056 /drivers/serial/sunsab.c | |
| parent | 8301d386afc55c877bafe2c6c7dc75a96ddd2838 (diff) | |
| download | linux-4e3533d05b6e5e66d1cda27f6671251c99c62894.tar.gz linux-4e3533d05b6e5e66d1cda27f6671251c99c62894.tar.bz2 linux-4e3533d05b6e5e66d1cda27f6671251c99c62894.zip | |
serial: suncore: Add 'ignore_line' argument to sunserial_console_match().
This tells the logic to ignore the line match when deciding whether the
device is the OpenFirmware specified console device or not.
This is going to be used in the SU driver for rsc-console detection.
There is probably a better way to handle this, but this is the least
intrusive solution for now which we can validate won't break any other
cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 8755de8adbca..e7215c200ecd 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -1027,10 +1027,12 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id * goto out1; sunserial_console_match(SUNSAB_CONSOLE(), op->node, - &sunsab_reg, up[0].port.line); + &sunsab_reg, up[0].port.line, + false); sunserial_console_match(SUNSAB_CONSOLE(), op->node, - &sunsab_reg, up[1].port.line); + &sunsab_reg, up[1].port.line, + false); err = uart_add_one_port(&sunsab_reg, &up[0].port); if (err) |