patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6e9badb..91e9282 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -157,20 +157,6 @@ config IDEDISK_MULTI_MODE
 
          If in doubt, say N.
 
-config IDEDISK_STROKE
-       bool "Auto-Geometry Resizing support"
-       depends on BLK_DEV_IDEDISK
-       help
-         Should you have a system w/ an AWARD Bios and your drives are larger
-         than 32GB and it will not boot, one is required to perform a few OEM
-         operations first.  The option is called "STROKE" because it allows
-         one to "soft clip" the drive to work around a barrier limit.  For
-         Maxtor drives it is called "jumpon.exe".  Please search Maxtor's
-         web-site for "JUMPON.EXE".  IBM has a similar tool at:
-         <http://www.storage.ibm.com/hdd/support/download.htm>.
-
-         If you are unsure, say N here.
-
 config BLK_DEV_IDECS
        tristate "PCMCIA IDE support"
        depends on PCMCIA
@@ -387,8 +373,8 @@ config BLK_DEV_OFFBOARD
          If in doubt, say N.
 
 config BLK_DEV_GENERIC
-       bool "Generic PCI IDE Chipset Support"
-       depends on PCI && BLK_DEV_IDEPCI
+       tristate "Generic PCI IDE Chipset Support"
+       depends on BLK_DEV_IDEPCI
 
 config BLK_DEV_OPTI621
        tristate "OPTi 82C621 chipset enhanced support (EXPERIMENTAL)"
@@ -438,48 +424,6 @@ config BLK_DEV_IDEDMA_PCI
 
 if BLK_DEV_IDEDMA_PCI
 
-# TCQ is disabled for now
-config BLK_DEV_IDE_TCQ
-       bool "ATA tagged command queueing (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && n
-       help
-         Support for tagged command queueing on ATA disk drives. This enables
-         the IDE layer to have multiple in-flight requests on hardware that
-         supports it. For now this includes the IBM Deskstar series drives,
-         such as the 22GXP, 75GXP, 40GV, 60GXP, and 120GXP (ie any Deskstar made
-         in the last couple of years), and at least some of the Western
-         Digital drives in the Expert series (by nature of really being IBM
-         drives).
-
-         If you have such a drive, say Y here.
-
-config BLK_DEV_IDE_TCQ_DEFAULT
-       bool "TCQ on by default"
-       depends on BLK_DEV_IDE_TCQ
-       ---help---
-         Enable tagged command queueing unconditionally on drives that report
-         support for it. Regardless of the chosen value here, tagging can be
-         controlled at run time:
-
-         echo "using_tcq:32" > /proc/ide/hdX/settings
-
-         where any value between 1-32 selects chosen queue depth and enables
-         TCQ, and 0 disables it. hdparm version 4.7 an above also support
-         TCQ manipulations.
-
-         Generally say Y here.
-
-config BLK_DEV_IDE_TCQ_DEPTH
-       int "Default queue depth"
-       depends on BLK_DEV_IDE_TCQ
-       default "8"
-       help
-         Maximum size of commands to enable per-drive. Any value between 1
-         and 32 is valid, with 32 being the maxium that the hardware supports.
-
-         You probably just want the default of 32 here. If you enter an invalid
-         number, the default value will be used.
-
 config BLK_DEV_IDEDMA_FORCED
        bool "Force enable legacy 2.0.X HOSTS to use DMA"
        help
@@ -851,9 +795,8 @@ config BLK_DEV_IDEDMA_PMAC_AUTO
          hardware may have caused damage.  Saying Y should be safe on all
          Apple machines.
 
-config BLK_DEV_IDE_SWARM
-       bool "SWARM onboard IDE support"
-       depends on SIBYTE_SWARM
+config IDE_ARM
+       def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
 
 config BLK_DEV_IDE_ICSIDE
        tristate "ICS IDE interface support"