From 6eb53f06c948dfcf19132b1b40b9dc5a1364f9ba Mon Sep 17 00:00:00 2001 From: Valentine Barshak Date: Fri, 12 Oct 2007 05:09:25 +1000 Subject: [PATCH] --- yaml --- r: 67589 b: refs/heads/master c: b63db45ca44a805ef21eb10a3750e88419156423 h: refs/heads/master i: 67587: 40f5e47554d94a222eee8f311ae05005c7f02450 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/legacy_serial.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa65bb2805a2..f7ab880b1060 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1189be6508d45183013ddb82b18f4934193de274 +refs/heads/master: b63db45ca44a805ef21eb10a3750e88419156423 diff --git a/trunk/arch/powerpc/kernel/legacy_serial.c b/trunk/arch/powerpc/kernel/legacy_serial.c index 90fa11c72e1c..4ed58875ee17 100644 --- a/trunk/arch/powerpc/kernel/legacy_serial.c +++ b/trunk/arch/powerpc/kernel/legacy_serial.c @@ -340,9 +340,10 @@ void __init find_legacy_serial_ports(void) } /* First fill our array with opb bus ports */ - for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16750")) != NULL;) { + for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) { struct device_node *opb = of_get_parent(np); - if (opb && !strcmp(opb->type, "opb")) { + if (opb && (!strcmp(opb->type, "opb") || + of_device_is_compatible(opb, "ibm,opb"))) { index = add_legacy_soc_port(np, np); if (index >= 0 && np == stdout) legacy_serial_console = index;