diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /drivers/sbus | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/zs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c index 67ef24fd3..a8703062a 100644 --- a/drivers/sbus/char/zs.c +++ b/drivers/sbus/char/zs.c @@ -1,4 +1,4 @@ -/* $Id: zs.c,v 1.60 2000/10/14 10:09:04 davem Exp $ +/* $Id: zs.c,v 1.61 2001/01/03 08:08:49 ecd Exp $ * zs.c: Zilog serial port driver for the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -944,7 +944,6 @@ static void shutdown(struct sun_serial * info) */ static void change_speed(struct sun_serial *info) { - unsigned short port; unsigned cflag; int quot = 0; int i; @@ -953,7 +952,7 @@ static void change_speed(struct sun_serial *info) if (!info->tty || !info->tty->termios) return; cflag = info->tty->termios->c_cflag; - if (!(port = info->port)) + if (!info->port) return; i = cflag & CBAUD; if (cflag & CBAUDEX) { @@ -1913,7 +1912,7 @@ int zs_open(struct tty_struct *tty, struct file * filp) static void show_serial_version(void) { - char *revision = "$Revision: 1.60 $"; + char *revision = "$Revision: 1.61 $"; char *version, *p; version = strchr(revision, ' '); |