aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/bugfix/m68k/478-serial.diff
blob: efa2d962d563b69386585f7c971d5e395dc0de82 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
To: linus, akpm
Cc: lkml
Subject: [PATCH] M68k SERIAL_PORT_DFNS only if CONFIG_ISA

From: Kars de Jong <jongk@linux-m68k.org>

M68k serial: 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>

---
 include/asm-m68k/serial.h |    2 ++
 1 file changed, 2 insertions(+)

--- linux-m68k-2.6.21.orig/include/asm-m68k/serial.h
+++ linux-m68k-2.6.21/include/asm-m68k/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