]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ide: merge ide_arm and ide_generic host drivers
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 31 Mar 2009 18:15:24 +0000 (20:15 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 31 Mar 2009 18:15:24 +0000 (20:15 +0200)
commit4465461ece2b9249d6c0cf57bc0002100823e361
tree763bd52d82ee519dedf3c8c496e60ed27f3428a5
parent52913ab2c6f760c2af9f9396765ce8fa1a2baf17
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>
drivers/ide/Kconfig
drivers/ide/Makefile
drivers/ide/ide-generic.c
drivers/ide/ide_arm.c [deleted file]