Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f8bd9de913fc004705002f7bd6e840b1c685b188

Authored by Kars de Jong
Committed by Geert Uytterhoeven
1 parent dc47ce90c3
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

arch/m68k/include/asm/serial.h
Diff comments   View file @ f8bd9de
... ... @@ -25,10 +25,12 @@
25 25 #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
26 26 #endif
27 27  
  28 +#ifdef CONFIG_ISA
28 29 #define SERIAL_PORT_DFNS \
29 30 /* UART CLK PORT IRQ FLAGS */ \
30 31 { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
31 32 { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
32 33 { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
33 34 { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
  35 +#endif