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/s390 | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/Config.in | 7 | ||||
| -rw-r--r-- | drivers/s390/char/con3215.c | 17 | ||||
| -rw-r--r-- | drivers/s390/char/hwc_con.c | 15 |
3 files changed, 15 insertions, 24 deletions
diff --git a/drivers/s390/Config.in b/drivers/s390/Config.in index d973c4e1b..dd95a0ab2 100644 --- a/drivers/s390/Config.in +++ b/drivers/s390/Config.in @@ -5,7 +5,7 @@ tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP if [ "$CONFIG_NET" = "y" ]; then tristate 'Network block device support' CONFIG_BLK_DEV_NBD fi -include drivers/md/Config.in +source drivers/md/Config.in tristate 'RAM disk support' CONFIG_BLK_DEV_RAM if [ "$CONFIG_BLK_DEV_RAM" = "y" ]; then bool ' Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD @@ -24,6 +24,8 @@ if [ "$CONFIG_DASD" != "n" ]; then bool ' Support for DIAG access to CMS reserved Disks' CONFIG_DASD_MDSK fi +endmenu + #menu_option next_comment #endmenu @@ -33,7 +35,7 @@ if [ "$CONFIG_NET" = "y" ]; then bool 'Channel Device Configuration (Temporary Option)' CONFIG_CHANDEV bool 'Network device support' CONFIG_NETDEVICES if [ "$CONFIG_NETDEVICES" = "y" ]; then - menu_option next_comment + mainmenu_option next_comment comment 'S390 Network devices' bool 'CTC device support' CONFIG_CTC bool 'IUCV device support (VM only)' CONFIG_IUCV @@ -41,6 +43,7 @@ if [ "$CONFIG_NET" = "y" ]; then bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET bool 'Token Ring driver support' CONFIG_TR bool 'FDDI driver support' CONFIG_FDDI + endmenu fi endmenu fi diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index aec5d83af..624d7dfd7 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -795,17 +795,12 @@ static int __init con3215_consetup(struct console *co, char *options) * 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 diff --git a/drivers/s390/char/hwc_con.c b/drivers/s390/char/hwc_con.c index 16d5553e8..238dd2150 100644 --- a/drivers/s390/char/hwc_con.c +++ b/drivers/s390/char/hwc_con.c @@ -35,17 +35,10 @@ kdev_t hwc_console_device (struct console *); 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 |