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

• Lines: 43
• Date: Tue Jan 4 10:12:15 2000
• Orig file: v2.2.13/linux/drivers/char/tty_io.c
• Orig date: Tue Jan 4 11:10:34 2000

diff -u --recursive --new-file v2.2.13/linux/drivers/char/tty_io.c linux/drivers/char/tty_io.c
@@ -129,6 +129,9 @@
 extern long console_8xx_init(long, long);
 extern int rs_8xx_init(void);
 #endif /* CONFIG_8xx */
+#ifdef CONFIG_3215
+extern long con3215_init(long, long);
+#endif /* CONFIG_3215 */
 
 #ifndef MIN
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
@@ -2070,6 +2073,9 @@
 #ifdef CONFIG_VT
 	kmem_start = con_init(kmem_start);
 #endif
+#ifdef CONFIG_HWC
+        kmem_start = hwc_console_init(kmem_start);
+#endif
 #ifdef CONFIG_SERIAL_CONSOLE
 #ifdef CONFIG_8xx
 	kmem_start = console_8xx_init(kmem_start, kmem_end);
@@ -2077,6 +2083,9 @@
 	kmem_start = serial_console_init(kmem_start, kmem_end);
 #endif /* CONFIG_8xx */
 #endif
+#ifdef CONFIG_3215
+       kmem_start = con3215_init(kmem_start, kmem_end);
+#endif
 	return kmem_start;
 }
 
@@ -2200,6 +2209,12 @@
         rs_8xx_init();
 #endif /* CONFIG_8xx */
 	pty_init();
+#ifdef CONFIG_MOXA_SMARTIO
+	mxser_init();
+#endif	
+#ifdef CONFIG_MOXA_INTELLIO
+	moxa_init();
+#endif	
 #ifdef CONFIG_VT
 	vcs_init();
 #endif