ARM: at91: remove NEED_MACH_IO_H
authorArnd Bergmann <arnd@arndb.de>
Thu, 12 Mar 2015 14:54:23 +0000 (15:54 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 13 Mar 2015 14:11:04 +0000 (15:11 +0100)
The mach/io.h header on at91 is used to support a nonstandard I/O space
window for the cf card driver. This changes the driver to use pci_ioremap_io
in order to have the standard location, and then removes the custom
mach/io.h.

[alexandre.belloni@free-electrons.com: Added PCI dependency]
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/Kconfig
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/include/mach/io.h [deleted file]
drivers/pcmcia/Kconfig
drivers/pcmcia/at91_cf.c

Simple merge
Simple merge
diff --cc arch/arm/mach-at91/include/mach/io.h
Simple merge
Simple merge
Simple merge