patch-2.4.0-test10 linux/drivers/s390/Config.in

Next file: linux/drivers/s390/char/con3215.c
Previous file: linux/drivers/pnp/isapnp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/s390/Config.in linux/drivers/s390/Config.in
@@ -5,7 +5,7 @@
 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 @@
   bool '   Support for DIAG access to CMS reserved Disks' CONFIG_DASD_MDSK
 fi
 
+endmenu
+
 #menu_option next_comment
 #endmenu
 
@@ -33,7 +35,7 @@
   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 @@
     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

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)