===== drivers/char/tty_io.c 1.33 vs edited =====
--- 1.33/drivers/char/tty_io.c	Tue Aug  3 16:53:10 2004
+++ edited/drivers/char/tty_io.c	Mon Aug  9 14:17:34 2004
@@ -2250,7 +2250,7 @@
 	au1x00_serial_console_init();
 #endif
 #ifdef CONFIG_SERIAL_CONSOLE
-#if defined(CONFIG_8xx) || defined(CONFIG_CONFIG_CPM2_UART)
+#if defined(CONFIG_8xx) || defined(CONFIG_CPM2_UART)
 	console_8xx_init();
 #elif defined(CONFIG_MAC_SERIAL) && defined(CONFIG_SERIAL)
 	if (_machine == _MACH_Pmac)
@@ -2439,7 +2439,7 @@
 #ifdef CONFIG_SPECIALIX
 	specialix_init();
 #endif
-#if (defined(CONFIG_8xx) || (defined(CONFIG_CPM2) && defined(CONFIG_CONFIG_CPM2_UART)))
+#if (defined(CONFIG_8xx) || (defined(CONFIG_CPM2) && defined(CONFIG_CPM2_UART)))
 	rs_8xx_init();
 #endif /* CONFIG_8xx */
 	pty_init();