summaryrefslogtreecommitdiffstats
path: root/drivers/ide/Makefile
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 20:15:24 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 20:15:24 +0200
commit4465461ece2b9249d6c0cf57bc0002100823e361 (patch)
tree763bd52d82ee519dedf3c8c496e60ed27f3428a5 /drivers/ide/Makefile
parent52913ab2c6f760c2af9f9396765ce8fa1a2baf17 (diff)
downloadlinux-4465461ece2b9249d6c0cf57bc0002100823e361.tar.gz
linux-4465461ece2b9249d6c0cf57bc0002100823e361.tar.bz2
linux-4465461ece2b9249d6c0cf57bc0002100823e361.zip
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>
Diffstat (limited to 'drivers/ide/Makefile')
-rw-r--r--drivers/ide/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 9b4bbe1cdc1a..81df925f0e8b 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -21,8 +21,6 @@ ide-core-$(CONFIG_IDE_LEGACY) += ide-legacy.o
obj-$(CONFIG_IDE) += ide-core.o
-obj-$(CONFIG_IDE_ARM) += ide_arm.o
-
obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o
obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o