ide: merge ide_arm and ide_generic host drivers

There is no need for a separate ide_arm host driver nowadays
so merge it into ide_generic one.

While at it:
- return -EBUSY from ide_generic_init() if I/O resources are busy
- scale down ide_generic_check_pci_legacy_iobases() for CONFIG_PCI=n

Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 640c99207242..896424445f65 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
@@ -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