Merge branch 'linus' into x86/i8259

[sfrench/cifs-2.6.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 1607536ff5fb3ec7da44b500157c1631703b3604..8e07de23d220911988d811f121bcd2b8d17e6699 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -823,13 +823,6 @@ 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_VR1000)
-       help
-         Say Y here if you want to support the onboard IDE channels on the
-         Simtec BAST or the Thorcom VR1000
-
 config IDE_H8300
        tristate "H8300 IDE support"
        depends on H8300