patch-1.3.63 linux/drivers/block/Config.in

• Lines: 62
• Date: Mon Feb 12 07:04:01 1996
• Orig file: v1.3.62/linux/drivers/block/Config.in
• Orig date: Fri Feb 9 17:52:58 1996

diff -u --recursive --new-file v1.3.62/linux/drivers/block/Config.in linux/drivers/block/Config.in
@@ -2,37 +2,35 @@
 # Block device driver configuration
 #
 mainmenu_option next_comment
-comment 'Block devices'
+comment 'Floppy, IDE, and other block devices'
 
 tristate 'Normal floppy disk support' CONFIG_BLK_DEV_FD
 tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
-bool 'Normal (MFM/RLL) disk and IDE disk/cdrom support' CONFIG_ST506
-if [ "$CONFIG_ST506" = "y" ]; then
-  comment 'Please see drivers/block/README.ide for help/info on IDE drives'
-  bool '   Use old disk-only driver for primary i/f' CONFIG_BLK_DEV_HD
-  if [ "$CONFIG_BLK_DEV_HD" = "y" ]; then
-    bool '   Include new IDE driver for secondary i/f support' CONFIG_BLK_DEV_IDE
-  else
-    bool '   Use new IDE driver for primary/secondary i/f' CONFIG_BLK_DEV_IDE
-  fi
-  if [ "$CONFIG_BLK_DEV_IDE" = "y" ]; then
-    bool '   Include IDE/ATAPI CDROM support' CONFIG_BLK_DEV_IDECD
-    bool '   Include (ALPHA) IDE/ATAPI TAPE support' CONFIG_BLK_DEV_IDETAPE
+bool 'Enhanced IDE/MFM/RLL disk/cdrom/tape support' CONFIG_BLK_DEV_IDE
+comment 'Please see drivers/block/README.ide for help/info on IDE drives'
+if [ "$CONFIG_BLK_DEV_IDE" = "n" ]; then
+  bool 'Old harddisk (MFM/RLL/IDE) driver' CONFIG_BLK_DEV_HD_ONLY
+else
+  bool '   Use old disk-only driver on primary interface' CONFIG_BLK_DEV_HD_IDE
+  bool '   Include IDE/ATAPI CDROM support' CONFIG_BLK_DEV_IDECD
+  bool '   Include IDE/ATAPI TAPE support' CONFIG_BLK_DEV_IDETAPE
+  bool '   CMD640 chipset bugfix/support' CONFIG_BLK_DEV_CMD640
+  if [ "$CONFIG_PCI" = "y" ]; then
     bool '   RZ1000 chipset bugfix/support' CONFIG_BLK_DEV_RZ1000
-    bool '   CMD640 chipset bugfix/support' CONFIG_BLK_DEV_CMD640
-    if [ "$CONFIG_PCI" = "y" ]; then
-      bool '   TRITON chipset DMA support' CONFIG_BLK_DEV_TRITON
-    fi
-    bool '   Other IDE chipset support' CONFIG_IDE_CHIPSETS
-    if [ "$CONFIG_IDE_CHIPSETS" = "y" ]; then
-      comment 'Note: most of these also require special kernel boot parameters'
-      bool '     DTC2278 chipset support' CONFIG_BLK_DEV_DTC2278
-      bool '     HT6560B chipset support' CONFIG_BLK_DEV_HT6560B
-      bool '     QD6580  chipset support' CONFIG_BLK_DEV_QD6580
-      bool '     UMC8672 chipset support' CONFIG_BLK_DEV_UMC8672
-      bool '     ALI14XX chipset support' CONFIG_BLK_DEV_ALI14XX
-    fi
+    bool '   Intel 430FX (Triton) chipset DMA support' CONFIG_BLK_DEV_TRITON
+  fi
+  bool '   Other IDE chipset support' CONFIG_IDE_CHIPSETS
+  if [ "$CONFIG_IDE_CHIPSETS" = "y" ]; then
+    comment 'Note: most of these also require special kernel boot parameters'
+    bool '      DTC-2278        chipset support' CONFIG_BLK_DEV_DTC2278
+    bool '      Holtek HT6560B  chipset support' CONFIG_BLK_DEV_HT6560B
+    bool '      QDI QD6580      chipset support' CONFIG_BLK_DEV_QD6580
+    bool '      UMC 8672        chipset support' CONFIG_BLK_DEV_UMC8672
+    bool '      ALI M1439/M1445 chipset support' CONFIG_BLK_DEV_ALI14XX
   fi
+fi
+if [ "$CONFIG_BLK_DEV_HD_IDE" = "y" -o "$CONFIG_BLK_DEV_HD_ONLY" = "y" ]; then
+  define_bool CONFIG_BLK_DEV_HD y
 fi
 
 bool 'XT harddisk support' CONFIG_BLK_DEV_XD