diff options
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index cf37f5ca4b71..4d96e1db55ee 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -33,13 +33,14 @@ static struct legacy_serial_info { | |||
| 33 | phys_addr_t taddr; | 33 | phys_addr_t taddr; |
| 34 | } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS]; | 34 | } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS]; |
| 35 | 35 | ||
| 36 | static struct __initdata of_device_id parents[] = { | 36 | static struct __initdata of_device_id legacy_serial_parents[] = { |
| 37 | {.type = "soc",}, | 37 | {.type = "soc",}, |
| 38 | {.type = "tsi-bridge",}, | 38 | {.type = "tsi-bridge",}, |
| 39 | {.type = "opb", }, | 39 | {.type = "opb", }, |
| 40 | {.compatible = "ibm,opb",}, | 40 | {.compatible = "ibm,opb",}, |
| 41 | {.compatible = "simple-bus",}, | 41 | {.compatible = "simple-bus",}, |
| 42 | {.compatible = "wrs,epld-localbus",}, | 42 | {.compatible = "wrs,epld-localbus",}, |
| 43 | {}, | ||
| 43 | }; | 44 | }; |
| 44 | 45 | ||
| 45 | static unsigned int legacy_serial_count; | 46 | static unsigned int legacy_serial_count; |
| @@ -327,7 +328,7 @@ void __init find_legacy_serial_ports(void) | |||
| 327 | struct device_node *parent = of_get_parent(np); | 328 | struct device_node *parent = of_get_parent(np); |
| 328 | if (!parent) | 329 | if (!parent) |
| 329 | continue; | 330 | continue; |
| 330 | if (of_match_node(parents, parent) != NULL) { | 331 | if (of_match_node(legacy_serial_parents, parent) != NULL) { |
| 331 | index = add_legacy_soc_port(np, np); | 332 | index = add_legacy_soc_port(np, np); |
| 332 | if (index >= 0 && np == stdout) | 333 | if (index >= 0 && np == stdout) |
| 333 | legacy_serial_console = index; | 334 | legacy_serial_console = index; |
