diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
commit | a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 (patch) | |
tree | 870f95ae22f423e60f4518fd38ab8e0649769991 /drivers/ide/Kconfig | |
parent | 15895b932b8a047a1db7006a4f9ca74485d5a826 (diff) | |
parent | 4283e1babe167e0ba856bb5d039465358e90785c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: fix /proc/ide/ide?/mate reporting
Revert "BAST: Remove old IDE driver"
Diffstat (limited to 'drivers/ide/Kconfig')
-rw-r--r-- | drivers/ide/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 8e07de23d220..1607536ff5fb 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -823,6 +823,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_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 |