diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/sbus/char/zs.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/sbus/char/zs.c')
| -rw-r--r-- | drivers/sbus/char/zs.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c index 7acfb2aba..67ef24fd3 100644 --- a/drivers/sbus/char/zs.c +++ b/drivers/sbus/char/zs.c @@ -1,4 +1,4 @@ -/* $Id: zs.c,v 1.59 2000/08/29 07:01:55 davem Exp $ +/* $Id: zs.c,v 1.60 2000/10/14 10:09:04 davem Exp $ * zs.c: Zilog serial port driver for the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -1913,7 +1913,7 @@ int zs_open(struct tty_struct *tty, struct file * filp) static void show_serial_version(void) { - char *revision = "$Revision: 1.59 $"; + char *revision = "$Revision: 1.60 $"; char *version, *p; version = strchr(revision, ' '); @@ -2830,17 +2830,13 @@ static int __init zs_console_setup(struct console *con, char *options) } static struct console zs_console = { - "ttyS", - zs_console_write, - NULL, - zs_console_device, - zs_console_wait_key, - NULL, - zs_console_setup, - CON_PRINTBUFFER, - -1, - 0, - NULL + name: "ttyS", + write: zs_console_write, + device: zs_console_device, + wait_key: zs_console_wait_key, + setup: zs_console_setup, + flags: CON_PRINTBUFFER, + index: -1, }; static int __init zs_console_init(void) |