Hi Linus,

This patch converts all initializations of `struct console' objects to new
style initialization constructs.

--- linux-2.4.0-test10-pre1/drivers/char/console.c      Fri Aug 11 13:53:24 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/console.c      Thu Oct 12 15:27:04 
+2000
@@ -2147,17 +2147,13 @@
 }
 
 struct console vt_console_driver = {
-       "tty",
-       vt_console_print,
-       NULL,
-       vt_console_device,
-       keyboard_wait_for_keypress,
-       unblank_screen,
-       NULL,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "tty",
+       write:          vt_console_print,
+       device:         vt_console_device,
+       wait_key:       keyboard_wait_for_keypress,
+       unblank:        unblank_screen,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 #endif
 
--- linux-2.4.0-test10-pre1/drivers/char/dz.c   Tue Jul 18 14:07:06 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/dz.c   Thu Oct 12 15:27:11 2000
@@ -1553,17 +1553,13 @@
 }
 
 static struct console dz_sercons = {
-       "ttyS",
-       dz_console_print,
-       NULL,
-       dz_console_device,
-       dz_console_wait_key,
-       NULL,
-       dz_console_setup,
-       CON_CONSDEV | CON_PRINTBUFFER,
-       CONSOLE_LINE,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          dz_console_print,
+       device:         dz_console_device,
+       wait_key:       dz_console_wait_key,
+       setup:          dz_console_setup,
+       flags:          CON_CONSDEV | CON_PRINTBUFFER,
+       index:          CONSOLE_LINE,
 };
 
 void __init dz_serial_console_init(void)
--- linux-2.4.0-test10-pre1/drivers/char/lp.c   Wed Oct  4 19:53:03 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/lp.c   Thu Oct 12 15:27:17 2000
@@ -603,17 +603,10 @@
 }
 
 static struct console lpcons = {
-       "lp",
-       lp_console_write,
-       NULL,
-       lp_console_device,
-       NULL,
-       NULL,
-       NULL,
-       CON_PRINTBUFFER,
-       0,
-       0,
-       NULL
+       name:           "lp",
+       write:          lp_console_write,
+       device:         lp_console_device,
+       flags:          CON_PRINTBUFFER,
 };
 
 #endif /* console on line printer */
--- linux-2.4.0-test10-pre1/drivers/char/serial.c       Sat Sep 23 17:31:15 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/serial.c       Thu Oct 12 15:27:24 
+2000
@@ -5666,17 +5666,13 @@
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/drivers/char/serial167.c    Mon Jul 17 15:20:00 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/serial167.c    Thu Oct 12 15:27:31 
+2000
@@ -2858,17 +2858,13 @@
 
 
 static struct console sercons = {
-       "ttyS",
-       serial167_console_write,
-       NULL,
-       serial167_console_device,
-       serial167_console_wait_key,
-       NULL,
-       serial167_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial167_console_write,
+       device:         serial167_console_device,
+       wait_key:       serial167_console_wait_key,
+       setup:          serial167_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 
--- linux-2.4.0-test10-pre1/drivers/char/serial_21285.c Tue Aug 15 19:00:27 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/serial_21285.c Thu Oct 12 15:27:39 
+2000
@@ -490,17 +490,13 @@
 
 static struct console rs285_cons =
 {
-       SERIAL_21285_NAME,
-       rs285_console_write,
-       NULL,
-       rs285_console_device,
-       rs285_console_wait_key,
-       NULL,
-       rs285_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           SERIAL_21285_NAME,
+       write:          rs285_console_write,
+       device:         rs285_console_device,
+       wait_key:       rs285_console_wait_key,
+       setup:          rs285_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 void __init rs285_console_init(void)
--- linux-2.4.0-test10-pre1/drivers/char/serial_amba.c  Wed Sep 20 13:19:42 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/serial_amba.c  Thu Oct 12 15:27:49 
+2000
@@ -2016,7 +2016,6 @@
 #endif
        device:         ambauart_console_device,
        wait_key:       ambauart_console_wait_key,
-       unblank:        NULL,
        setup:          ambauart_console_setup,
        flags:          CON_PRINTBUFFER,
        index:          -1,
--- linux-2.4.0-test10-pre1/drivers/char/sh-sci.c       Wed Oct  4 19:53:04 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/sh-sci.c       Thu Oct 12 15:27:55 
+2000
@@ -1247,17 +1247,13 @@
 }
 
 static struct console sercons = {
-       "ttySC",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttySC",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/drivers/char/vme_scc.c      Mon Jul 17 15:20:01 2000
+++ geert-console-2.4.0-test10-pre1/drivers/char/vme_scc.c      Thu Oct 12 15:28:01 
+2000
@@ -1111,17 +1111,13 @@
 
 
 static struct console sercons = {
-       "ttyS",
-       scc_console_write,
-       NULL,
-       scc_console_device,
-       scc_console_wait_key,
-       NULL,
-       scc_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          scc_console_write,
+       device:         scc_console_device,
+       wait_key:       scc_console_wait_key,
+       setup:          scc_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 
--- linux-2.4.0-test10-pre1/drivers/sbus/char/sab82532.c        Sat Sep  9 19:04:27 
2000
+++ geert-console-2.4.0-test10-pre1/drivers/sbus/char/sab82532.c        Thu Oct 12 
+15:28:26 2000
@@ -2596,17 +2596,13 @@
 }
 
 static struct console sab82532_console = {
-       "ttyS",
-       sab82532_console_write,
-       NULL,
-       sab82532_console_device,
-       sab82532_console_wait_key,
-       NULL,
-       sab82532_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          sab82532_console_write,
+       device:         sab82532_console_device,
+       wait_key:       sab82532_console_wait_key,
+       setup:          sab82532_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 int __init sab82532_console_init(void)
--- linux-2.4.0-test10-pre1/drivers/sbus/char/su.c      Sat Sep  9 19:04:27 2000
+++ geert-console-2.4.0-test10-pre1/drivers/sbus/char/su.c      Thu Oct 12 15:28:33 
+2000
@@ -2938,17 +2938,13 @@
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 int su_console_registered = 0;
--- linux-2.4.0-test10-pre1/drivers/sbus/char/zs.c      Sat Sep  9 19:04:28 2000
+++ geert-console-2.4.0-test10-pre1/drivers/sbus/char/zs.c      Thu Oct 12 15:28:39 
+2000
@@ -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)
--- linux-2.4.0-test10-pre1/drivers/macintosh/macserial.c       Sun Sep 17 20:04:12 
2000
+++ geert-console-2.4.0-test10-pre1/drivers/macintosh/macserial.c       Thu Oct 12 
+15:28:07 2000
@@ -2890,17 +2890,13 @@
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/drivers/sgi/char/sgiserial.c        Tue Jul 18 14:07:19 
2000
+++ geert-console-2.4.0-test10-pre1/drivers/sgi/char/sgiserial.c        Thu Oct 12 
+15:31:08 2000
@@ -2208,17 +2208,13 @@
 }
 
 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,
 };
 
 /*
--- linux-2.4.0-test10-pre1/drivers/tc/zs.c     Tue Jul 18 14:07:20 2000
+++ geert-console-2.4.0-test10-pre1/drivers/tc/zs.c     Thu Oct 12 15:28:53 2000
@@ -1998,17 +1998,13 @@
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/drivers/s390/char/con3215.c Fri Jul 28 21:19:14 2000
+++ geert-console-2.4.0-test10-pre1/drivers/s390/char/con3215.c Thu Oct 12 15:28:14 
+2000
@@ -795,17 +795,12 @@
  *  The console structure for the 3215 console
  */
 static struct console con3215 = {
-       "tty3215",
-       con3215_write,
-       NULL,
-       con3215_device,
-       NULL,
-       con3215_unblank,
-       con3215_consetup,
-       CON_PRINTBUFFER,
-       0,
-       0,
-       NULL
+       name:           "tty3215",
+       write:          con3215_write,
+       device:         con3215_device,
+       unblank:        con3215_unblank,
+       setup:          con3215_consetup,
+       flags:          CON_PRINTBUFFER,
 };
 
 #endif
--- linux-2.4.0-test10-pre1/drivers/s390/char/hwc_con.c Tue Jul 18 13:57:52 2000
+++ geert-console-2.4.0-test10-pre1/drivers/s390/char/hwc_con.c Thu Oct 12 15:28:21 
+2000
@@ -35,17 +35,10 @@
 struct console hwc_console =
 {
 
-       hwc_console_name,
-       hwc_console_write,
-       NULL,
-       hwc_console_device,
-       NULL,
-       NULL,
-       NULL,
-       CON_PRINTBUFFER,
-       0,
-       0,
-       NULL
+       name:           hwc_console_name,
+       write:          hwc_console_write,
+       device:         hwc_console_device,
+       flags:          CON_PRINTBUFFER,
 };
 
 void 
--- linux-2.4.0-test10-pre1/arch/alpha/kernel/setup.c   Fri Jul 28 21:18:56 2000
+++ geert-console-2.4.0-test10-pre1/arch/alpha/kernel/setup.c   Thu Oct 12 15:24:45 
+2000
@@ -449,17 +449,13 @@
 }
 
 static struct console srmcons = {
-        "srm0",
-        srm_console_write,
-        NULL,
-        srm_console_device,
-        srm_console_wait_key,
-        NULL,
-       srm_console_setup,
-        CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
-        -1,
-        0,
-        NULL
+       name:           "srm0",
+       write:          srm_console_write,
+       device:         srm_console_device,
+       wait_key:       srm_console_wait_key,
+       setup:          srm_console_setup,
+       flags:          CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
+       index:          -1,
 };
 
 #else
--- linux-2.4.0-test10-pre1/arch/sparc/kernel/setup.c   Sat Sep  9 19:04:18 2000
+++ geert-console-2.4.0-test10-pre1/arch/sparc/kernel/setup.c   Thu Oct 12 15:26:32 
+2000
@@ -287,7 +287,9 @@
 }
 
 static struct console prom_console = {
-       "PROM", prom_cons_write, 0, 0, 0, 0, 0, CON_PRINTBUFFER, 0, 0, 0
+       name:           "PROM",
+       write:          prom_cons_write,
+       flags:          CON_PRINTBUFFER,
 };
 #endif
 
--- linux-2.4.0-test10-pre1/arch/mips/sgi/kernel/promcon.c      Tue Jul 18 13:59:12 
2000
+++ geert-console-2.4.0-test10-pre1/arch/mips/sgi/kernel/promcon.c      Thu Oct 12 
+15:25:57 2000
@@ -49,17 +49,13 @@
 
 static struct console sercons =
 {
-    "ttyS",
-    prom_console_write,
-    NULL,
-    prom_console_device,
-    prom_console_wait_key,
-    NULL,
-    prom_console_setup,
-    CON_PRINTBUFFER,
-    -1,
-    0,
-    NULL
+    name:      "ttyS",
+    write:     prom_console_write,
+    device:    prom_console_device,
+    wait_key:  prom_console_wait_key,
+    setup:     prom_console_setup,
+    flags:     CON_PRINTBUFFER,
+    index:     -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/mips/baget/vacserial.c Wed Oct  4 19:52:48 2000
+++ geert-console-2.4.0-test10-pre1/arch/mips/baget/vacserial.c Thu Oct 12 15:25:35 
+2000
@@ -2811,17 +2811,13 @@
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/mips/dec/promcon.c     Mon Jul 17 14:46:22 2000
+++ geert-console-2.4.0-test10-pre1/arch/mips/dec/promcon.c     Thu Oct 12 15:25:42 
+2000
@@ -47,17 +47,13 @@
 
 static struct console sercons =
 {
-    "ttyS",
-    prom_console_write,
-    NULL,
-    prom_console_device,
-    prom_console_wait_key,
-    NULL,
-    prom_console_setup,
-    CON_PRINTBUFFER,
-    -1,
-    0,
-    NULL
+    name:      "ttyS",
+    write:     prom_console_write,
+    device:    prom_console_device,
+    wait_key:  prom_console_wait_key,
+    setup:     prom_console_setup,
+    flags:     CON_PRINTBUFFER,
+    index:     -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/mips/orion/promcon.c   Tue Jul 18 14:08:46 2000
+++ geert-console-2.4.0-test10-pre1/arch/mips/orion/promcon.c   Thu Oct 12 15:25:50 
+2000
@@ -68,17 +68,13 @@
 
 static struct console sercons =
 {
-    "ttyS",
-    prom_console_write,
-    NULL,
-    prom_console_device,
-    prom_console_wait_key,
-    NULL,
-    prom_console_setup,
-    CON_PRINTBUFFER,
-    -1,
-    0,
-    NULL
+    name:      "ttyS",
+    write:     prom_console_write,
+    device:    prom_console_device,
+    wait_key:  prom_console_wait_key,
+    setup:     prom_console_setup,
+    flags:     CON_PRINTBUFFER,
+    index:     -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/ppc/8xx_io/uart.c      Tue Jul 18 14:08:47 2000
+++ geert-console-2.4.0-test10-pre1/arch/ppc/8xx_io/uart.c      Thu Oct 12 15:26:12 
+2000
@@ -2407,17 +2407,13 @@
 
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       CONFIG_SERIAL_CONSOLE_PORT,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          CONFIG_SERIAL_CONSOLE_PORT,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/ppc/amiga/config.c     Mon Jul 17 14:57:32 2000
+++ geert-console-2.4.0-test10-pre1/arch/ppc/amiga/config.c     Thu Oct 12 15:30:10 
+2000
@@ -97,17 +97,10 @@
 #endif
 
 static struct console amiga_console_driver = {
-       "debug",
-       NULL,                   /* write */
-       NULL,                   /* read */
-       NULL,                   /* device */
-       amiga_wait_key,         /* wait_key */
-       NULL,                   /* unblank */
-       NULL,                   /* setup */
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       wait_key:       amiga_wait_key,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 #ifdef CONFIG_MAGIC_SYSRQ
--- linux-2.4.0-test10-pre1/arch/ppc/8260_io/uart.c     Sun Sep 17 20:04:08 2000
+++ geert-console-2.4.0-test10-pre1/arch/ppc/8260_io/uart.c     Thu Oct 12 15:26:05 
+2000
@@ -2268,17 +2268,13 @@
 
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       serial_console_setup,
-       CON_PRINTBUFFER,
-       CONFIG_SERIAL_CONSOLE_PORT,
-       0,
-       NULL
+       name:           "ttyS",
+       write:          serial_console_write,
+       device:         serial_console_device,
+       wait_key:       serial_console_wait_key,
+       setup:          serial_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          CONFIG_SERIAL_CONSOLE_PORT,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/m68k/amiga/config.c    Mon Jul 17 15:13:27 2000
+++ geert-console-2.4.0-test10-pre1/arch/m68k/amiga/config.c    Thu Oct 12 15:29:35 
+2000
@@ -89,17 +89,10 @@
 #endif
 
 static struct console amiga_console_driver = {
-       "debug",
-       NULL,                   /* write */
-       NULL,                   /* read */
-       NULL,                   /* device */
-       amiga_wait_key,         /* wait_key */
-       NULL,                   /* unblank */
-       NULL,                   /* setup */
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       wait_key:       amiga_wait_key,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 #ifdef CONFIG_MAGIC_SYSRQ
--- linux-2.4.0-test10-pre1/arch/m68k/atari/debug.c     Mon Jul 17 15:14:47 2000
+++ geert-console-2.4.0-test10-pre1/arch/m68k/atari/debug.c     Thu Oct 12 15:25:11 
+2000
@@ -31,17 +31,9 @@
 int atari_SCC_reset_done = 0;
 
 static struct console atari_console_driver = {
-       "debug",
-       NULL,                   /* write */
-       NULL,                   /* read */
-       NULL,                   /* device */
-       NULL,                   /* wait_key */
-       NULL,                   /* unblank */
-       NULL,                   /* setup */
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 
--- linux-2.4.0-test10-pre1/arch/m68k/mac/debug.c       Mon Jul 17 15:14:48 2000
+++ geert-console-2.4.0-test10-pre1/arch/m68k/mac/debug.c       Thu Oct 12 15:25:19 
+2000
@@ -159,17 +159,9 @@
 static int scc_port = -1;
 
 static struct console mac_console_driver = {
-       "debug",
-       NULL,                   /* write */
-       NULL,                   /* read */
-       NULL,                   /* device */
-       NULL,                   /* wait_key */
-       NULL,                   /* unblank */
-       NULL,                   /* setup */
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 /*
--- linux-2.4.0-test10-pre1/arch/m68k/q40/config.c      Mon Jul 17 14:46:21 2000
+++ geert-console-2.4.0-test10-pre1/arch/m68k/q40/config.c      Thu Oct 12 15:29:46 
+2000
@@ -74,17 +74,10 @@
 
 static int q40_wait_key(struct console *co){return 0;}
 static struct console q40_console_driver = {
-       "debug",
-       NULL,                   /* write */
-       NULL,                   /* read */
-       NULL,                   /* device */
-       q40_wait_key,           /* wait_key */
-       NULL,                   /* unblank */
-       NULL,                   /* setup */
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       wait_key:       q40_wait_key,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 
--- linux-2.4.0-test10-pre1/arch/sparc64/kernel/setup.c Wed Oct  4 19:52:53 2000
+++ geert-console-2.4.0-test10-pre1/arch/sparc64/kernel/setup.c Thu Oct 12 15:26:51 
+2000
@@ -75,17 +75,10 @@
 }
 
 static struct console prom_console = {
-       "prom",
-       prom_console_write,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       CON_CONSDEV | CON_ENABLED,
-       -1,
-       0,
-       NULL
+       name:           "prom",
+       write:          prom_console_write,
+       flags:          CON_CONSDEV | CON_ENABLED,
+       index:          -1,
 };
 
 #define PROM_TRUE      -1
@@ -294,17 +287,10 @@
 
 #ifdef PROM_DEBUG_CONSOLE
 static struct console prom_debug_console = {
-       "debug",
-       prom_console_write,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "debug",
+       write:          prom_console_write,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 #endif
 
--- linux-2.4.0-test10-pre1/arch/sh/kernel/setup.c      Fri Aug 11 13:53:21 2000
+++ geert-console-2.4.0-test10-pre1/arch/sh/kernel/setup.c      Thu Oct 12 15:26:27 
+2000
@@ -166,17 +166,13 @@
 }
 
 static struct console sh_console = {
-       "bios",
-       sh_console_write,
-       NULL,
-       sh_console_device,
-       sh_console_wait_key,
-       NULL,
-       sh_console_setup,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       name:           "bios",
+       write:          sh_console_write,
+       device:         sh_console_device,
+       wait_key:       sh_console_wait_key,
+       setup:          sh_console_setup,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 void sh_console_init(void)
--- linux-2.4.0-test10-pre1/arch/ia64/hp/hpsim_console.c        Mon Jul 17 15:15:59 
2000
+++ geert-console-2.4.0-test10-pre1/arch/ia64/hp/hpsim_console.c        Thu Oct 12 
+15:29:28 2000
@@ -28,17 +28,13 @@
 static kdev_t simcons_console_device (struct console *);
 
 struct console hpsim_cons = {
-       "simcons",
-       simcons_write,          /* write */
-       NULL,                   /* read */
-       simcons_console_device, /* device */
-       simcons_wait_key,       /* wait_key */
-       NULL,                   /* unblank */
-       simcons_init,           /* setup */
-       CON_PRINTBUFFER,        /* flags */
-       -1,                     /* index */
-       0,                      /* cflag */
-       NULL                    /* next */
+       name:           "simcons",
+       write:          simcons_write,
+       device:         simcons_console_device,
+       wait_key:       simcons_wait_key,
+       setup:          simcons_init,
+       flags:          CON_PRINTBUFFER,
+       index:          -1,
 };
 
 static int

Gr{oetje,eeting}s,

                                                Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                                            -- Linus Torvalds

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/

Reply via email to