summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorKars de Jong <jongk@linux-m68k.org>2008-11-18 21:22:22 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-12-10 19:52:45 +0100
commitf8bd9de913fc004705002f7bd6e840b1c685b188 (patch)
treeba446611fc9264c797952f780a6baf6e375ee4d6 /arch/m68k
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
downloadop-kernel-dev-f8bd9de913fc004705002f7bd6e840b1c685b188.zip
op-kernel-dev-f8bd9de913fc004705002f7bd6e840b1c685b188.tar.gz
m68k/serial: SERIAL_PORT_DFNS only if CONFIG_ISA
Only define SERIAL_PORT_DFNS when CONFIG_ISA is defined. Otherwise the first 4 slots in the 8250 driver are unavailable on non-ISA machines. Signed-off-by: Kars de Jong <jongk@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/serial.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/serial.h b/arch/m68k/include/asm/serial.h
index 2b90d6e..7267536 100644
--- a/arch/m68k/include/asm/serial.h
+++ b/arch/m68k/include/asm/serial.h
@@ -25,9 +25,11 @@
#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
#endif
+#ifdef CONFIG_ISA
#define SERIAL_PORT_DFNS \
/* UART CLK PORT IRQ FLAGS */ \
{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
+#endif
OpenPOWER on IntegriCloud