Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not

-Werror clean.

1 files changed, 2 insertions, 16 deletions

diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c
index f9512e12c..40284c603 100644
--- a/drivers/sbus/char/zs.c
+++ b/drivers/sbus/char/zs.c
@@ -1,4 +1,4 @@
-/* $Id: zs.c,v 1.57 2000/04/26 09:36:32 davem Exp $
+/* $Id: zs.c,v 1.58 2000/07/06 01:41:38 davem Exp $
  * zs.c: Zilog serial port driver for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -824,20 +824,6 @@ static void do_serial_hangup(void *private_)
 	tty_hangup(tty);
 }
 
-
-/*
- * 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 zs_timer(void)
-{
-	printk("zs_timer called\n");
-	prom_halt();
-	return;
-}
-
 static int startup(struct sun_serial * info)
 {
 	unsigned long flags;
@@ -1920,7 +1906,7 @@ int zs_open(struct tty_struct *tty, struct file * filp)
 
 static void show_serial_version(void)
 {
-	char *revision = "$Revision: 1.57 $";
+	char *revision = "$Revision: 1.58 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');