patch-2.4.26 linux-2.4.26/drivers/char/tty_io.c

Next file: linux-2.4.26/drivers/i2c/Config.in
Previous file: linux-2.4.26/drivers/char/sonypi.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.25/drivers/char/tty_io.c linux-2.4.26/drivers/char/tty_io.c
@@ -2249,7 +2249,7 @@
 	au1x00_serial_console_init();
 #endif
 #ifdef CONFIG_SERIAL_CONSOLE
-#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if (defined(CONFIG_8xx) || defined(CONFIG_CPM2))
 	console_8xx_init();
 #elif defined(CONFIG_MAC_SERIAL) && defined(CONFIG_SERIAL)
 	if (_machine == _MACH_Pmac)
@@ -2435,7 +2435,7 @@
 #ifdef CONFIG_SPECIALIX
 	specialix_init();
 #endif
-#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if (defined(CONFIG_8xx) || defined(CONFIG_CPM2))
 	rs_8xx_init();
 #endif /* CONFIG_8xx */
 	pty_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)