diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-24 23:03:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 23:03:34 +0100 |
| commit | 4e3533d05b6e5e66d1cda27f6671251c99c62894 (patch) | |
| tree | 0eed98a48ff54e7fbdeb51227ed95f1b4774e056 /drivers/serial/sunzilog.c | |
| parent | sunsu: Fix detection of SU ports which are RSC console or control. (diff) | |
| download | linux-4e3533d05b6e5e66d1cda27f6671251c99c62894.tar.xz 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/sunzilog.c')
| -rw-r--r-- | drivers/serial/sunzilog.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index ef693ae22e7f..3242688978e5 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c @@ -1416,7 +1416,8 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m if (!keyboard_mouse) { if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node, - &sunzilog_reg, up[0].port.line)) + &sunzilog_reg, up[0].port.line, + false)) up->flags |= SUNZILOG_FLAG_IS_CONS; err = uart_add_one_port(&sunzilog_reg, &up[0].port); if (err) { @@ -1425,7 +1426,8 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m return err; } if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node, - &sunzilog_reg, up[1].port.line)) + &sunzilog_reg, up[1].port.line, + false)) up->flags |= SUNZILOG_FLAG_IS_CONS; err = uart_add_one_port(&sunzilog_reg, &up[1].port); if (err) { |