3 files changed, 35 insertions, 51 deletions

diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index faf8b4d3ca01..e3c0f2928149 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -542,45 +542,6 @@ config ETRAX_RS485_DISABLE_RECEIVER
           loopback.  Not all products are able to do this in software only.
           Axis 2400/2401 must disable receiver.
 
-config ETRAX_IDE
-        bool "ATA/IDE support"
-        select IDE
-        select BLK_DEV_IDE
-        select BLK_DEV_IDEDISK
-        select BLK_DEV_IDECD
-        select BLK_DEV_IDEDMA
-        select IDE_GENERIC
-        help
-          Enable this to get support for ATA/IDE.
-          You can't use parallel ports or SCSI ports
-          at the same time.
-
-
-config ETRAX_IDE_DELAY
-        int "Delay for drives to regain consciousness"
-        depends on ETRAX_IDE
-        default 15
-        help
-          Number of seconds to wait for IDE drives to spin up after an IDE
-          reset.
-choice
-        prompt "IDE reset pin"
-        depends on ETRAX_IDE
-        default ETRAX_IDE_PB7_RESET
-
-config ETRAX_IDE_PB7_RESET
-        bool "Port_PB_Bit_7"
-        help
-          IDE reset on pin 7 on port B
-
-config ETRAX_IDE_G27_RESET
-        bool "Port_G_Bit_27"
-        help
-          IDE reset on pin 27 on port G
-
-endchoice
-
-
 config ETRAX_USB_HOST
         bool "USB host"
         select USB
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 7f72d7c9e1ce..9bccb5e2a960 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -582,18 +582,6 @@ config ETRAX_PE_CHANGEABLE_BITS
           that a user can change the value on using ioctl's.
           Bit set = changeable.
 
-config ETRAX_IDE
-        bool "ATA/IDE support"
-        depends on ETRAX_ARCH_V32
-        select IDE
-        select BLK_DEV_IDE
-        select BLK_DEV_IDEDISK
-        select BLK_DEV_IDECD
-        select BLK_DEV_IDEDMA
-        select IDE_GENERIC
-        help
-          Enables the ETRAX IDE driver.
-
 config ETRAX_CARDBUS
         bool "Cardbus support"
         depends on ETRAX_ARCH_V32
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index ca8239a2c98a..403e3ffca4e0 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -882,6 +882,41 @@ config BLK_DEV_IDE_BAST
           Say Y here if you want to support the onboard IDE channels on the
           Simtec BAST or the Thorcom VR1000
 
+config ETRAX_IDE
+        bool "ETRAX IDE support"
+        depends on CRIS && BROKEN
+        select BLK_DEV_IDEDMA
+        select IDE_GENERIC
+        help
+          Enables the ETRAX IDE driver.
+
+          You can't use parallel ports or SCSI ports at the same time.
+
+config ETRAX_IDE_DELAY
+        int "Delay for drives to regain consciousness"
+        depends on ETRAX_IDE && ETRAX_ARCH_V10
+        default 15
+        help
+          Number of seconds to wait for IDE drives to spin up after an IDE
+          reset.
+
+choice
+        prompt "IDE reset pin"
+        depends on ETRAX_IDE && ETRAX_ARCH_V10
+        default ETRAX_IDE_PB7_RESET
+
+config ETRAX_IDE_PB7_RESET
+        bool "Port_PB_Bit_7"
+        help
+          IDE reset on pin 7 on port B
+
+config ETRAX_IDE_G27_RESET
+        bool "Port_G_Bit_27"
+        help
+          IDE reset on pin 27 on port G
+
+endchoice
+
 config IDE_H8300
         bool "H8300 IDE support"
         depends on H8300