This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6e9badb..c43ac49 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -387,8 +387,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)"
@@ -851,9 +851,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"