diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
| commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
| tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /drivers/ide/Kconfig | |
| parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'drivers/ide/Kconfig')
| -rw-r--r-- | drivers/ide/Kconfig | 7 |
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 | |||
| 823 | Say Y here if you want to support the Yellowstone RapIDE controller | 823 | Say Y here if you want to support the Yellowstone RapIDE controller |
| 824 | manufactured for use with Acorn computers. | 824 | manufactured for use with Acorn computers. |
| 825 | 825 | ||
| 826 | config BLK_DEV_IDE_BAST | ||
| 827 | tristate "Simtec BAST / Thorcom VR1000 IDE support" | ||
| 828 | depends on ARM && (ARCH_BAST || MACH_VR1000) | ||
| 829 | help | ||
| 830 | Say Y here if you want to support the onboard IDE channels on the | ||
| 831 | Simtec BAST or the Thorcom VR1000 | ||
| 832 | |||
| 833 | config IDE_H8300 | 826 | config IDE_H8300 |
| 834 | tristate "H8300 IDE support" | 827 | tristate "H8300 IDE support" |
| 835 | depends on H8300 | 828 | depends on H8300 |