patch-2.4.2 linux/drivers/s390/Config.in

• Lines: 110
• Date: Tue Feb 13 14:13:44 2001
• Orig file: v2.4.1/linux/drivers/s390/Config.in
• Orig date: Sun Oct 8 09:30:41 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/s390/Config.in linux/drivers/s390/Config.in
@@ -1,64 +1,74 @@
 mainmenu_option next_comment
-comment 'S/390 block device drivers'
+comment 'Block device drivers'
 
 tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
-if [ "$CONFIG_NET" = "y" ]; then
-  tristate 'Network block device support' CONFIG_BLK_DEV_NBD
-fi
-source drivers/md/Config.in
+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
 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
+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+  int '   Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 24576
 fi
+dep_bool '   Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD
+tristate 'XPRAM disk support' CONFIG_BLK_DEV_XPRAM
 
-bool 'Support for VM minidisk (VM only)' CONFIG_MDISK
-if [ "$CONFIG_MDISK" = "y" ]; then
-  bool '   Support for synchronous read-write' CONFIG_MDISK_SYNC
-fi
+comment 'S/390 block device drivers'
 
 tristate 'Support for DASD devices' CONFIG_DASD
 if [ "$CONFIG_DASD" != "n"  ]; then
-  comment 'DASD disciplines'
   bool '   Support for ECKD Disks' CONFIG_DASD_ECKD
+  bool '   Support for FBA  Disks' CONFIG_DASD_FBA
 #  bool '   Support for CKD  Disks' CONFIG_DASD_CKD
-  bool '   Support for DIAG access to CMS reserved Disks' CONFIG_DASD_MDSK
+  if [ "$CONFIG_ARCH_S390" = "y" ]; then
+    bool '   Support for DIAG access to CMS reserved Disks' CONFIG_DASD_MDSK
+  fi;
 fi
 
 endmenu
 
-#menu_option next_comment
-#endmenu
+source drivers/md/Config.in
 
-if [ "$CONFIG_NET" = "y" ]; then
-  mainmenu_option next_comment
-  comment 'S/390 Network device support'
-  bool 'Channel Device Configuration (Temporary Option)' CONFIG_CHANDEV
-  bool 'Network device support' CONFIG_NETDEVICES
-  if [ "$CONFIG_NETDEVICES" = "y" ]; then
-    mainmenu_option next_comment
-    comment 'S390 Network devices'
-    bool 'CTC device support' CONFIG_CTC
-    bool 'IUCV device support (VM only)' CONFIG_IUCV
-    tristate 'Dummy net driver support' CONFIG_DUMMY
-    bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
-    bool 'Token Ring driver support' CONFIG_TR
-    bool 'FDDI driver support' CONFIG_FDDI
-    endmenu
-  fi
-  endmenu
+mainmenu_option next_comment
+comment 'Character device drivers'
+bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
+if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
+  int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
 fi
 
-mainmenu_option next_comment
-comment 'S/390 Terminal and Console options'
+comment 'S/390 character device drivers'
 
 bool 'Support for 3215 line mode terminal' CONFIG_3215
 if [ "$CONFIG_3215" = "y" ]; then
   bool 'Support for console on 3215 line mode terminal' CONFIG_3215_CONSOLE
 fi
-
 bool 'Support for HWC line mode terminal' CONFIG_HWC
 if [ "$CONFIG_HWC" = "y" ]; then
   bool 'console on HWC line mode terminal' CONFIG_HWC_CONSOLE
 fi
+tristate 'S/390 tape device support' CONFIG_S390_TAPE
+if [ "$CONFIG_S390_TAPE" != "n" ]; then
+  comment 'S/390 tape interface support'
+  bool '   Support for tape character devices' CONFIG_S390_TAPE_CHAR
+  bool '   Support for tape block devices' CONFIG_S390_TAPE_BLOCK
+  comment 'S/390 tape hardware support'
+  bool '   Support for 3490 tape hardware' CONFIG_S390_TAPE_3490
+  bool '   Support for 3480 tape hardware' CONFIG_S390_TAPE_3480
+fi
 endmenu
+
+if [ "$CONFIG_NET" = "y" ]; then
+  mainmenu_option next_comment
+  comment 'Network device drivers'
+  bool 'Network device support' CONFIG_NETDEVICES
+
+  if [ "$CONFIG_NETDEVICES" = "y" ]; then
+    tristate 'Dummy net driver support' CONFIG_DUMMY
+    bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
+    bool 'Token Ring driver support' CONFIG_TR
+    bool 'FDDI driver support' CONFIG_FDDI
+    comment 'S/390 network device drivers'
+    bool 'Channel Device Configuration (Temporary Option)' CONFIG_CHANDEV
+    tristate 'CTC device support' CONFIG_CTC
+    tristate 'IUCV device support (VM only)' CONFIG_IUCV
+  fi
+  endmenu
+fi