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

• Lines: 51
• Date: Mon Jan 31 10:32:53 2000
• Orig file: v2.3.41/linux/drivers/char/tty_io.c
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.3.41/linux/drivers/char/tty_io.c linux/drivers/char/tty_io.c
@@ -128,6 +128,14 @@
 #ifdef CONFIG_SX
 extern int sx_init (void);
 #endif
+#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
+extern int vme_scc_init (void);
+extern long vme_scc_console_init(void);
+#endif
+#ifdef CONFIG_SERIAL167
+extern int serial167_init(void);
+extern long serial167_console_init(void);
+#endif
 #ifdef CONFIG_8xx
 extern console_8xx_init(void);
 extern int rs_8xx_init(void);
@@ -2090,9 +2098,15 @@
 #ifdef CONFIG_SERIAL_CONSOLE
 #ifdef CONFIG_8xx
 	console_8xx_init();
-#else 	
+#elif defined(CONFIG_SERIAL) 	
 	serial_console_init();
 #endif /* CONFIG_8xx */
+#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
+	vme_scc_console_init();
+#endif
+#if defined(CONFIG_SERIAL167)
+	serial167_console_init();
+#endif
 #endif
 }
 
@@ -2176,6 +2190,9 @@
 #ifdef CONFIG_SERIAL
 	rs_init();
 #endif
+#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
+	vme_scc_init();
+#endif
 #ifdef CONFIG_COMPUTONE
 	ip2_init();
 #endif
@@ -2185,7 +2202,7 @@
 #ifdef CONFIG_ROCKETPORT
 	rp_init();
 #endif
-#ifdef CONFIG_MVME16x
+#ifdef CONFIG_SERIAL167
 	serial167_init();
 #endif
 #ifdef CONFIG_CYCLADES