Merge with 2.4.0-test3-pre4.

1 files changed, 0 insertions, 23 deletions

diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c
index 8b3126340..b0ccff4f8 100644
--- a/drivers/sgi/char/sgiserial.c
+++ b/drivers/sgi/char/sgiserial.c
@@ -665,19 +665,6 @@ static void do_serial_hangup(void *private_)
 }
 
 
-/*
- * This subroutine is called when the RS_TIMER goes off.  It is used
- * by the serial driver to handle ports that do not have an interrupt
- * (irq=0).  This doesn't work at all for 16450's, as a sun has a Z8530.
- */
- 
-static void rs_timer(void)
-{
-	printk("rs_timer called\n");
-	prom_halt();
-	return;
-}
-
 static int startup(struct sgi_serial * info)
 {
 	volatile unsigned char junk;
@@ -751,14 +738,6 @@ static int startup(struct sgi_serial * info)
 	info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
 	/*
-	 * Set up serial timers...
-	 */
-#if 0  /* Works well and stops the machine. */
-	timer_table[RS_TIMER].expires = jiffies + 2;
-	timer_active |= 1 << RS_TIMER;
-#endif
-
-	/*
 	 * and set the speed of the serial port
 	 */
 	change_speed(info);
@@ -1842,8 +1821,6 @@ int rs_init(void)
 
 	/* Setup base handler, and timer table. */
 	init_bh(SERIAL_BH, do_serial_bh);
-	timer_table[RS_TIMER].fn = rs_timer;
-	timer_table[RS_TIMER].expires = 0;
 
 	show_serial_version();