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-scsi: use print_hex_dump from <linux/kernel.h>
  ide: More TSST drives with broken cable detection
  ali14xx: constify __initdata
  ide: remove bogus ide_fix_driveid() comment
  trm290: remove bogus init_hwif_trm290() comment
  piix: add HP compaq laptop to short cable list
  alim15x3: add Mitac 8317 and derivatives to ali_cable_override()
  ide: add TORiSAN model: CD-ROM CDR_U200 fw: 1.09 to DMA blacklist
  amd74xx: arm hack
  drivers/ide: Add missing "space"
  ide-cris: don't override ide_register_hw() result
  ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig
  ide: add CONFIG_IDE_H8300 config option
  ide/Kconfig: fix mpc8xx host driver dependencies
  macide/q40ide: add missing __init tag to {macide,q40ide}_init()
  aec62xx: Fix kernel oops in driver's probe function
  ide: skip ide_wait_not_busy() on noprobe-disks
  siimage: remove resetproc() method
  ide: don't set PIO mode on pre-EIDE drives
  sis5513.c: Add Packard Bell EasyNote K5305 to laptops

2 files changed, 0 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