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

Next file: linux/drivers/block/Makefile
Previous file: linux/arch/i386/lib/delay.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.67/linux/drivers/block/Config.in linux/drivers/block/Config.in
@@ -23,7 +23,12 @@
     fi
     if [ "$CONFIG_PCI" = "y" ]; then
       bool '   RZ1000 chipset bugfix/support' CONFIG_BLK_DEV_RZ1000
-      bool '   Intel PIIX/PIIX3/PIIX4 (Triton 430FX/HX/VX/TX, 440FX) DMA support' CONFIG_BLK_DEV_TRITON
+      bool '   PCI bus-master DMA support' CONFIG_BLK_DEV_IDEDMA
+      if [ "$CONFIG_BLK_DEV_IDEDMA" = "y" ]; then
+        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+          bool '      OPTi 82C621 enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621
+        fi
+      fi
     fi
     bool '   Other IDE chipset support' CONFIG_IDE_CHIPSETS
     if [ "$CONFIG_IDE_CHIPSETS" = "y" ]; then
@@ -32,10 +37,7 @@
       bool '      DTC-2278        support' CONFIG_BLK_DEV_DTC2278
       bool '      Holtek HT6560B  support' CONFIG_BLK_DEV_HT6560B
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-        bool '      PROMISE DC4030  support (EXPERIMENTAL)' CONFIG_BLK_DEV_PROMISE
-        if [ "$CONFIG_PCI" = "y" ]; then
-          bool '      OPTi 82C621     support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621
-        fi
+        bool '      PROMISE DC4030  support (EXPERIMENTAL)' CONFIG_BLK_DEV_PDC4030
       fi
       bool '      QDI QD6580      support' CONFIG_BLK_DEV_QD6580
       bool '      UMC 8672        support' CONFIG_BLK_DEV_UMC8672

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov