diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-01 15:46:35 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-01 15:46:35 -0800 |
commit | 7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3 (patch) | |
tree | cf6d526a070a06b365ab0ceb4e1c3ca9ad94666e /drivers/serial/sunhv.c | |
parent | 138f3c8518976953563a1316d7e0420c72d4ab96 (diff) | |
parent | 2127816366e0ffbc1426fa69e7b9b2bebd2e2288 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/serial/sunhv.c')
-rw-r--r-- | drivers/serial/sunhv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index d548652dee5..d14cca7fb88 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c @@ -566,7 +566,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m goto out_free_con_read_page; sunserial_console_match(&sunhv_console, op->node, - &sunhv_reg, port->line); + &sunhv_reg, port->line, false); err = uart_add_one_port(&sunhv_reg, port); if (err) |