vserver 1.9.3

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

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index f28496b..4305f7c 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -457,11 +457,6 @@ config IDEDMA_ONLYDISK
 
          Generally say N here.
 
-config BLK_DEV_ADMA
-       bool
-       depends on PCI && BLK_DEV_IDEPCI
-       default BLK_DEV_IDEDMA_PCI
-
 config BLK_DEV_AEC62XX
        tristate "AEC62XX chipset support"
        help
@@ -835,6 +830,13 @@ config BLK_DEV_IDE_RAPIDE
          Say Y here if you want to support the Yellowstone RapIDE controller
          manufactured for use with Acorn computers.
 
+config BLK_DEV_IDE_BAST
+       tristate "Simtec BAST / Thorcom VR1000 IDE support"
+       depends on ARM && (ARCH_BAST || MACH_VR100)
+       help
+         Say Y here if you want to support the onboard IDE channels on the
+         Simtec BAST or the Thorcom VR1000
+
 config BLK_DEV_GAYLE
        bool "Amiga Gayle IDE interface support"
        depends on AMIGA