From 145557e9d63e8e081eb549a06e9b60288d39e146 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 24 Nov 2009 14:11:40 -0800 Subject: [PATCH] --- yaml --- r: 168979 b: refs/heads/master c: 1917d17b903955b8b2903626a2e01d071a5d0ec9 h: refs/heads/master i: 168977: 144ed3e005e2d070c24af8d75c6ce3c20a581128 168975: b76cc3036e37c309530c3a8655e9cc26d6d49b1a v: v3 --- [refs] | 2 +- trunk/drivers/serial/sunsu.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aa8860f7b1ca..e52b6021a283 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 457931de3b0925dc2eb941bc7d611a509be36dff +refs/heads/master: 1917d17b903955b8b2903626a2e01d071a5d0ec9 diff --git a/trunk/drivers/serial/sunsu.c b/trunk/drivers/serial/sunsu.c index 4868b318e55e..4ee4167c662f 100644 --- a/trunk/drivers/serial/sunsu.c +++ b/trunk/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;