arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead

Preparation for uniform definition of ioremap, ioremap_wc, ioremap_wt,
and ioremap_cache, tree-wide.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c
index 00022ee..9d3dde0 100644 (file)
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/arch/arm/mach-shmobile/pm-rcar.c
@@ -12,7 +12,7 @@
 #include <linux/err.h>
 #include <linux/mm.h>
 #include <linux/spinlock.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include "pm-rcar.h"
 
 /* SYSC */

diff --cc arch/ia64/kernel/cyclone.c
Simple merge

diff --cc drivers/isdn/icn/icn.h
Simple merge

diff --cc drivers/mtd/devices/slram.c
Simple merge

diff --cc drivers/mtd/nand/diskonchip.c
Simple merge

diff --cc drivers/mtd/onenand/generic.c
Simple merge

diff --cc drivers/scsi/sun3x_esp.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ii_pci20kc.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge

diff --cc drivers/video/fbdev/s1d13xxxfb.c
Simple merge

diff --cc drivers/video/fbdev/stifb.c
Simple merge

diff --cc include/linux/io-mapping.h
Simple merge

diff --cc include/linux/mtd/map.h
Simple merge

diff --cc include/video/vga.h
Simple merge