Merge branch 'linux-2.6'

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b4f3aefa12b6..8e07de23d220 100644
--- 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
@@ -1028,6 +1021,7 @@ endif
 
 config BLK_DEV_HD_ONLY
         bool "Old hard disk (MFM/RLL/IDE) driver"
+        depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
         help
           There are two drivers for MFM/RLL/IDE hard disks. Most people use
           the newer enhanced driver, but this old one is still around for two