Commit 577bca9e authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds

[PATCH] CONFIG_ISA does not make sense for CONFIG_PPC_PSERIES

Older pSeries systems with serial ports dont get any console output after
recent changes.  CONFIG_ISA does not make sense for CONFIG_PPC_PSERIES
because it enables lots of old drivers.  Instead, remove the dependency on
CONFIG_ISA from the serial port discovery code.
Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3833a705
...@@ -134,7 +134,6 @@ static int __init add_legacy_soc_port(struct device_node *np, ...@@ -134,7 +134,6 @@ static int __init add_legacy_soc_port(struct device_node *np,
return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags); return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags);
} }
#ifdef CONFIG_ISA
static int __init add_legacy_isa_port(struct device_node *np, static int __init add_legacy_isa_port(struct device_node *np,
struct device_node *isa_brg) struct device_node *isa_brg)
{ {
...@@ -168,7 +167,6 @@ static int __init add_legacy_isa_port(struct device_node *np, ...@@ -168,7 +167,6 @@ static int __init add_legacy_isa_port(struct device_node *np,
return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF); return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF);
} }
#endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __init add_legacy_pci_port(struct device_node *np, static int __init add_legacy_pci_port(struct device_node *np,
...@@ -276,7 +274,6 @@ void __init find_legacy_serial_ports(void) ...@@ -276,7 +274,6 @@ void __init find_legacy_serial_ports(void)
of_node_put(soc); of_node_put(soc);
} }
#ifdef CONFIG_ISA
/* First fill our array with ISA ports */ /* First fill our array with ISA ports */
for (np = NULL; (np = of_find_node_by_type(np, "serial"));) { for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
struct device_node *isa = of_get_parent(np); struct device_node *isa = of_get_parent(np);
...@@ -287,7 +284,6 @@ void __init find_legacy_serial_ports(void) ...@@ -287,7 +284,6 @@ void __init find_legacy_serial_ports(void)
} }
of_node_put(isa); of_node_put(isa);
} }
#endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* Next, try to locate PCI ports */ /* Next, try to locate PCI ports */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment