patch-2.3.99-pre2 linux/drivers/ide/Config.in

• Lines: 50
• Date: Fri Mar 17 13:10:45 2000
• Orig file: v2.3.99-pre1/linux/drivers/ide/Config.in
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/drivers/ide/Config.in linux/drivers/ide/Config.in
@@ -32,7 +32,6 @@
 	    bool '    Boot off-board chipsets first support' CONFIG_BLK_DEV_OFFBOARD
 	    dep_bool '      Use PCI DMA by default when available' CONFIG_IDEDMA_PCI_AUTO $CONFIG_BLK_DEV_IDEDMA_PCI
 	    define_bool CONFIG_BLK_DEV_IDEDMA $CONFIG_BLK_DEV_IDEDMA_PCI
-	    define_bool CONFIG_IDEDMA_AUTO $CONFIG_IDEDMA_PCI_AUTO
 	    define_bool CONFIG_IDEDMA_PCI_EXPERIMENTAL $CONFIG_EXPERIMENTAL
 	    dep_bool '      ATA Work(s) In Progress (EXPERIMENTAL)' CONFIG_IDEDMA_PCI_WIP $CONFIG_BLK_DEV_IDEDMA_PCI $CONFIG_EXPERIMENTAL
 	    dep_bool '      Good-Bad DMA Model-Firmware (WIP)' CONFIG_IDEDMA_NEW_DRIVE_LISTINGS $CONFIG_IDEDMA_PCI_WIP
@@ -72,14 +71,12 @@
 	 dep_bool '      PowerMac IDE DMA support' CONFIG_BLK_DEV_IDEDMA_PMAC $CONFIG_BLK_DEV_IDE_PMAC
 	 dep_bool '        Use DMA by default' CONFIG_IDEDMA_PMAC_AUTO $CONFIG_BLK_DEV_IDEDMA_PMAC
 	 define_bool CONFIG_BLK_DEV_IDEDMA $CONFIG_BLK_DEV_IDEDMA_PMAC
-	 define_bool CONFIG_IDEDMA_AUTO $CONFIG_IDEDMA_PMAC_AUTO
       fi
       if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
 	 dep_bool '    ICS IDE interface support' CONFIG_BLK_DEV_IDE_ICSIDE $CONFIG_ARCH_ACORN
 	 dep_bool '      ICS DMA support' CONFIG_BLK_DEV_IDEDMA_ICS $CONFIG_BLK_DEV_IDE_ICSIDE
 	 dep_bool '        Use ICS DMA by default' CONFIG_IDEDMA_ICS_AUTO $CONFIG_BLK_DEV_IDEDMA_ICS
 	 define_bool CONFIG_BLK_DEV_IDEDMA $CONFIG_BLK_DEV_IDEDMA_ICS
-	 define_bool CONFIG_IDEDMA_AUTO $CONFIG_IDEDMA_ICS_AUTO
 	 dep_bool '    RapIDE interface support' CONFIG_BLK_DEV_IDE_RAPIDE $CONFIG_ARCH_ACORN
       fi
       if [ "$CONFIG_AMIGA" = "y" ]; then
@@ -115,19 +112,13 @@
    define_bool CONFIG_BLK_DEV_HD $CONFIG_BLK_DEV_HD_ONLY
 fi
 
-# if [ "$CONFIG_BLK_DEV_IDEDMA_PCI" = "y" -o \
-#      "$CONFIG_BLK_DEV_IDEDMA_PMAC" = "y" -o \
-#      "$CONFIG_BLK_DEV_IDEDMA_ICS" = "y" ]; then
-#    define_bool CONFIG_BLK_DEV_IDEDMA y
-#    if [ "$CONFIG_IDEDMA_PCI_AUTO" = "y" -o \
-#         "$CONFIG_IDEDMA_PMAC_AUTO" = "y" -o \
-#         "$CONFIG_IDEDMA_ICS_AUTO" = "y" ]; then
-#       define_bool CONFIG_IDEDMA_AUTO y
-#    fi
-# else
-#    define_bool CONFIG_BLK_DEV_IDEDMA n
-#    define_bool CONFIG_IDEDMA_AUTO n
-# fi
+if [ "$CONFIG_IDEDMA_PCI_AUTO" = "y" -o \
+     "$CONFIG_IDEDMA_PMAC_AUTO" = "y" -o \
+     "$CONFIG_IDEDMA_ICS_AUTO" = "y" ]; then
+   define_bool CONFIG_IDEDMA_AUTO y
+else
+   define_bool CONFIG_IDEDMA_AUTO n
+fi
 
 if [ "$CONFIG_IDE_CHIPSETS" = "y" -o \
      "$CONFIG_BLK_DEV_AEC6210" = "y" -o \