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/sgi/char/sgiserial.c | |
parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/sgi/char/sgiserial.c')
-rw-r--r-- | drivers/sgi/char/sgiserial.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index ad382c751..bf4899735 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -2253,17 +2253,13 @@ static int __init zs_console_setup(struct console *con, char *options) } static struct console sgi_console_driver = { - "ttyS", - zs_console_write, /* write */ - NULL, /* read */ - zs_console_device, /* device */ - zs_console_wait_key, /* wait_key */ - NULL, /* unblank */ - zs_console_setup, /* 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, }; /* |