1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 640c99207242..cf06494bb744 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -222,7 +222,8 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
         tristate "generic/default IDE chipset support"
-        depends on ALPHA || X86 || IA64 || M32R || MIPS
+        depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK
+        default ARM && (ARCH_RPC || ARCH_SHARK)
         help
           This is the generic IDE driver.  This driver attaches to the
           fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
@@ -680,7 +681,7 @@ endif
 # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
 config BLK_DEV_IDE_PMAC
         tristate "PowerMac on-board IDE support"
-        depends on PPC_PMAC && IDE=y
+        depends on PPC_PMAC
         select IDE_TIMINGS
         select BLK_DEV_IDEDMA_PCI
         help
@@ -731,11 +732,6 @@ config BLK_DEV_IDE_AT91
         depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
         select IDE_TIMINGS
 
-config IDE_ARM
-        tristate "ARM IDE support"
-        depends on ARM && (ARCH_RPC || ARCH_SHARK)
-        default y
-
 config BLK_DEV_IDE_ICSIDE
         tristate "ICS IDE interface support"
         depends on ARM && ARCH_ACORN
@@ -774,27 +770,20 @@ config BLK_DEV_GAYLE
           This includes on-board IDE interfaces on some Amiga models (A600,
           A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion
           bus (M-Tech E-Matrix 530 expansion card).
-          Say Y if you have an Amiga with a Gayle IDE interface and want to use
-          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
-          it.
-          Note that you also have to enable Zorro bus support if you want to
-          use Gayle IDE interfaces on the Zorro expansion bus.
 
-config BLK_DEV_IDEDOUBLER
-        bool "Amiga IDE Doubler support (EXPERIMENTAL)"
-        depends on BLK_DEV_GAYLE && EXPERIMENTAL
-        ---help---
-          This feature provides support for the so-called `IDE doublers' (made
+          It also provides support for the so-called `IDE doublers' (made
           by various manufacturers, e.g. Eyetech) that can be connected to
           the on-board IDE interface of some Amiga models. Using such an IDE
           doubler, you can connect up to four instead of two IDE devices to
-          the Amiga's on-board IDE interface.
+          the Amiga's on-board IDE interface. The feature is enabled at kernel
+          runtime using the "gayle.doubler" kernel boot parameter.
 
-          Note that the normal Amiga Gayle IDE driver may not work correctly
-          if you have an IDE doubler and don't enable this feature!
+          Say Y if you have an Amiga with a Gayle IDE interface and want to use
+          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
+          it.
 
-          Say Y if you have an IDE doubler.  The feature is enabled at kernel
-          runtime using the "gayle.doubler" kernel boot parameter.
+          Note that you also have to enable Zorro bus support if you want to
+          use Gayle IDE interfaces on the Zorro expansion bus.
 
 config BLK_DEV_BUDDHA
         tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"