patch-2.4.25 linux-2.4.25/include/asm-ppc/pc_serial.h

• Lines: 31
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/include/asm-ppc/pc_serial.h
• Orig date: 2003-08-25 04:44:44.000000000 -0700

diff -urN linux-2.4.24/include/asm-ppc/pc_serial.h linux-2.4.25/include/asm-ppc/pc_serial.h
@@ -26,15 +26,6 @@
 #define RS_TABLE_SIZE  4
 #endif
 
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
-#endif
-
 #ifdef CONFIG_SERIAL_MANY_PORTS
 #define FOURPORT_FLAGS ASYNC_FOURPORT
 #define ACCENT_FLAGS 0
@@ -60,10 +51,10 @@
 
 #define STD_SERIAL_PORT_DEFNS			\
 	/* 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 */
+	{ 0, BASE_BAUD, 0x3F8, 4, ASYNC_BOOT_AUTOCONF }, /* ttyS0 */	\
+	{ 0, BASE_BAUD, 0x2F8, 3, ASYNC_BOOT_AUTOCONF }, /* ttyS1 */	\
+	{ 0, BASE_BAUD, 0x3E8, 4, ASYNC_BOOT_AUTOCONF }, /* ttyS2 */	\
+	{ 0, BASE_BAUD, 0x2E8, 3, ASYNC_BOOT_AUTOCONF }, /* ttyS3 */
 
 
 #ifdef CONFIG_SERIAL_MANY_PORTS