summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2006-02-01 03:04:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:08 -0800
commit577bca9eff94193a06e426f8dbf6b3152247a209 (patch)
tree14d7f911f60e085e8ce33c32cdab458663543479 /arch
parent3833a70585fd4b0f64e275ba0cc3f5e5038253fd (diff)
downloadlinux-3.10-577bca9eff94193a06e426f8dbf6b3152247a209.tar.gz
linux-3.10-577bca9eff94193a06e426f8dbf6b3152247a209.tar.bz2
linux-3.10-577bca9eff94193a06e426f8dbf6b3152247a209.zip
[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: Olaf Hering <olh@suse.de> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/legacy_serial.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index f970ace208d..c7a799a0951 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -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);
}
-#ifdef CONFIG_ISA
static int __init add_legacy_isa_port(struct device_node *np,
struct device_node *isa_brg)
{
@@ -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);
}
-#endif
#ifdef CONFIG_PCI
static int __init add_legacy_pci_port(struct device_node *np,
@@ -276,7 +274,6 @@ void __init find_legacy_serial_ports(void)
of_node_put(soc);
}
-#ifdef CONFIG_ISA
/* First fill our array with ISA ports */
for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
struct device_node *isa = of_get_parent(np);
@@ -287,7 +284,6 @@ void __init find_legacy_serial_ports(void)
}
of_node_put(isa);
}
-#endif
#ifdef CONFIG_PCI
/* Next, try to locate PCI ports */