summaryrefslogtreecommitdiff
path: root/drivers/ide/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-25 12:29:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-25 12:29:02 +0200
commit37f5d732f34fa099676b2c52b8a57bab01a011de (patch)
treecca207ab2009e8d5d2097602133d1a20de2b2e5c /drivers/ide/Kconfig
parented9e4996d9a123b7550e63713d563f524fa9d9f0 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
Merge branch 'linus' into tracing/sysproftip-tracing-sysprof-2008-06-25_10.29_Wed
Diffstat (limited to 'drivers/ide/Kconfig')
-rw-r--r--drivers/ide/Kconfig7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 1607536ff5fb..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