[Linux-mips-commits] CVS: linux/drivers/char tty_io.c,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv15361/drivers/char

Modified Files:
	tty_io.c 
Log Message:
Synced to Ralph's tree

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/tty_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tty_io.c	2001/08/10 03:04:58	1.3
--- tty_io.c	2001/08/22 18:18:14	1.4
***************
*** 149,152 ****
--- 149,153 ----
  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);
***************
*** 1874,1877 ****
--- 1875,1880 ----
  void do_SAK(struct tty_struct *tty)
  {
+ 	if (!tty)
+ 		return;
  	PREPARE_TQUEUE(&tty->SAK_tq, __do_SAK, tty);
  	schedule_task(&tty->SAK_tq);
***************
*** 2190,2193 ****
--- 2193,2198 ----
  #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();
***************
*** 2321,2327 ****
  #ifdef CONFIG_COMPUTONE
  	ip2_init();
- #endif
- #ifdef CONFIG_MAC_SERIAL
- 	macserial_init();
  #endif
  #ifdef CONFIG_ROCKETPORT
--- 2326,2329 ----