summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-25 13:33:22 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-25 13:33:22 +1100
commit3493c85366ba09c9d0972c919e7123367a39982a (patch)
tree07f72b0bb99343e195883f9a6741bee1be5e8b40 /arch
parentf7ea82beb24f65e2058fa4029edefa0949e872b1 (diff)
downloadlinux-3.10-3493c85366ba09c9d0972c919e7123367a39982a.tar.gz
linux-3.10-3493c85366ba09c9d0972c919e7123367a39982a.tar.bz2
linux-3.10-3493c85366ba09c9d0972c919e7123367a39982a.zip
powerpc: Fix build on some non-freescale platforms
Commit 9deaa53ac7fa373623123aa4f18828dd62292b1a broke build on platforms that use legacy_serial.c without also having CONFIG_SERIAL_8250_FSL enabled due to an unconditional code to a routine in that module. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/legacy_serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 3fea3689527..bedd12e1cfb 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -442,8 +442,10 @@ static void __init fixup_port_irq(int index,
port->irq = virq;
+#ifdef CONFIG_SERIAL_8250_FSL
if (of_device_is_compatible(np, "fsl,ns16550"))
port->handle_irq = fsl8250_handle_irq;
+#endif
}
static void __init fixup_port_pio(int index,