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

• Lines: 36
• Date: Mon Jul 2 14:16:31 2001
• Orig file: v2.4.5/linux/drivers/char/tty_io.c
• Orig date: Thu Apr 26 17:35:49 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/char/tty_io.c linux/drivers/char/tty_io.c
@@ -148,6 +148,7 @@
 extern long serial167_console_init(void);
 extern void console_8xx_init(void);
 extern int rs_8xx_init(void);
+extern void mac_scc_console_init(void);
 extern void hwc_console_init(void);
 extern void hwc_tty_init(void);
 extern void con3215_init(void);
@@ -1871,6 +1872,8 @@
  */
 void do_SAK(struct tty_struct *tty)
 {
+	if (!tty)
+		return;
 	PREPARE_TQUEUE(&tty->SAK_tq, __do_SAK, tty);
 	schedule_task(&tty->SAK_tq);
 }
@@ -2184,6 +2187,8 @@
 #ifdef CONFIG_SERIAL_CONSOLE
 #if (defined(CONFIG_8xx) || defined(CONFIG_8260))
 	console_8xx_init();
+#elif defined(CONFIG_MAC_SERIAL)
+	mac_scc_console_init();
 #elif defined(CONFIG_SERIAL)
 	serial_console_init();
 #endif /* CONFIG_8xx */
@@ -2306,9 +2311,6 @@
 #endif
 #ifdef CONFIG_COMPUTONE
 	ip2_init();
-#endif
-#ifdef CONFIG_MAC_SERIAL
-	macserial_init();
 #endif
 #ifdef CONFIG_ROCKETPORT
 	rp_init();