patch-2.4.0-test10 linux/drivers/sbus/char/zs.c

• Lines: 40
• Date: Mon Oct 16 13:36:08 2000
• Orig file: v2.4.0-test9/linux/drivers/sbus/char/zs.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/sbus/char/zs.c linux/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 @@
 
 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 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)