introduce io.h

To allow for some generic io accessors introduce io.h and use
this instead of asm/io.h throughout the tree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

55 files changed, 55 insertions, 55 deletions

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 2d075f72ca..c1e9cafa80 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -44,7 +44,7 @@
 
 #include <linux/err.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <i2c/i2c.h>
 #include <mach/generic.h>
 #include <mach/clock.h>
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 95c4fdf782..2a1ae7af75 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -43,7 +43,7 @@
 
 #include <linux/err.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <i2c/i2c.h>
 #include <mach/generic.h>
 #include <mach/omap3-clock.h>
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index 7af153aa2f..4a29cad18f 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <clock.h>
 #include <gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/board.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index 358f0dc25c..a0e61f0d01 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -32,7 +32,7 @@
 #include <malloc.h>
 #include <mci.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <mach/clock.h>
 #include <mach/generic.h>
diff --git a/drivers/mci/imx.c b/drivers/mci/imx.c
index 905c251db3..50c98e1cef 100644
--- a/drivers/mci/imx.c
+++ b/drivers/mci/imx.c
@@ -26,7 +26,7 @@
 #include <init.h>
 #include <driver.h>
 #include <mach/clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define DRIVER_NAME "imx-mmc"
 
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c
index 70b8be9bf7..d747ad1b17 100644
--- a/drivers/mci/mxs.c
+++ b/drivers/mci/mxs.c
@@ -39,7 +39,7 @@
 #include <mci.h>
 #include <errno.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/bitops.h>
 #include <mach/imx-regs.h>
 #include <mach/mci.h>
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index bf8d4a9796..3f70e22629 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -29,7 +29,7 @@
 #include <mci.h>
 #include <clock.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include <mach/omap_hsmmc.h>
 
diff --git a/drivers/mci/s3c.c b/drivers/mci/s3c.c
index c621445e5c..f97e13a6dd 100644
--- a/drivers/mci/s3c.c
+++ b/drivers/mci/s3c.c
@@ -39,7 +39,7 @@
 #include <mci.h>
 #include <errno.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/mci.h>
 #include <mach/s3c24xx-generic.h>
 #include <mach/s3c24x0-iomap.h>
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 07104078dc..8cc1b51f7f 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -31,7 +31,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <mach/board.h>
 
 #include <errno.h>
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e762524540..2433945571 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -29,7 +29,7 @@
 #include <linux/delay.h>
 #include <linux/rslib.h>
 #include <linux/moduleparam.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 5e122a10a5..2710f6a309 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 #include <module.h>
 
diff --git a/drivers/mtd/nand/nand_hwecc.c b/drivers/mtd/nand/nand_hwecc.c
index 95b08d3a79..5ead49c60c 100644
--- a/drivers/mtd/nand/nand_hwecc.c
+++ b/drivers/mtd/nand/nand_hwecc.c
@@ -6,7 +6,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 
 #include "nand.h"
diff --git a/drivers/mtd/nand/nand_hwecc_syndrome.c b/drivers/mtd/nand/nand_hwecc_syndrome.c
index 9a66180952..dd067c9970 100644
--- a/drivers/mtd/nand/nand_hwecc_syndrome.c
+++ b/drivers/mtd/nand/nand_hwecc_syndrome.c
@@ -6,7 +6,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 #include <module.h>
 
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index f270326aaa..581136aed4 100644
--- a/drivers/mtd/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
@@ -27,7 +27,7 @@
 #include <mach/generic.h>
 #include <mach/imx-nand.h>
 #include <mach/imx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 #include <errno.h>
 
 #define NFC_V3_FLASH_CMD		(host->regs_axi + 0x00)
diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c
index 083aa57520..a012c03dec 100644
--- a/drivers/mtd/nand/nand_omap_gpmc.c
+++ b/drivers/mtd/nand/nand_omap_gpmc.c
@@ -71,7 +71,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/silicon.h>
 #include <mach/gpmc.h>
 #include <mach/gpmc_nand.h>
diff --git a/drivers/mtd/nand/nand_s3c2410.c b/drivers/mtd/nand/nand_s3c2410.c
index 0ce20d42c3..c5f5d97db3 100644
--- a/drivers/mtd/nand/nand_s3c2410.c
+++ b/drivers/mtd/nand/nand_s3c2410.c
@@ -33,7 +33,7 @@
 #include <mach/s3c24xx-generic.h>
 #include <mach/s3c24x0-iomap.h>
 #include <mach/s3c24x0-nand.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm-generic/errno.h>
 
 #ifdef CONFIG_S3C24XX_NAND_BOOT
diff --git a/drivers/mtd/nand/nand_swecc.c b/drivers/mtd/nand/nand_swecc.c
index 93511cbe3d..a5edffaece 100644
--- a/drivers/mtd/nand/nand_swecc.c
+++ b/drivers/mtd/nand/nand_swecc.c
@@ -6,7 +6,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 
 #include "nand.h"
diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c
index 3ede8d02f0..13b6c8984f 100644
--- a/drivers/mtd/nand/nand_write.c
+++ b/drivers/mtd/nand/nand_write.c
@@ -6,7 +6,7 @@
 #include <linux/err.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 #include <module.h>
 
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index 3073011614..c1e93ad076 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -30,7 +30,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <mach/nand.h>
 #include <mach/fsmc.h>
 
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 7e456c762e..5163488183 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -31,7 +31,7 @@
 #include <clock.h>
 #include <linux/mii.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <asm/dma-mapping.h>
 
 #include "altera_tse.h"
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index 33afc5e0f3..da23755a5e 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -27,7 +27,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <errno.h>
 
 /* I/O ports for I/O Space operation */
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index e9ec61b37d..f32778135d 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -50,7 +50,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <xfuncs.h>
 #include <dm9000.h>
 #include <errno.h>
diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c
index 954ec789f3..227e317492 100644
--- a/drivers/net/ep93xx.c
+++ b/drivers/net/ep93xx.c
@@ -35,7 +35,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <miidev.h>
-#include <asm/io.h>
+#include <io.h>
 #include <linux/types.h>
 #include <mach/ep93xx-regs.h>
 #include "ep93xx.h"
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 3b0f266a2b..ae63fdc3b5 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -28,7 +28,7 @@
 #include <fec.h>
 
 #include <asm/mmu.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/generic.h>
 #include <mach/imx-regs.h>
 #include <clock.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index e3368c93db..c1f7f68484 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -46,7 +46,7 @@
 #include <init.h>
 #include <miidev.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/board.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 5503bc94dd..81a7ff4fcd 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
-#include <asm/io.h>
+#include <io.h>
 #include <miidev.h>
 #include <mach/netx-xc.h>
 #include <mach/netx-eth.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 2313aaeb63..c51f8c7291 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -73,7 +73,7 @@
 #include <xfuncs.h>
 #include <errno.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 /*---------------------------------------------------------------
  .
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index fba61c460f..e34c0df90d 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -36,7 +36,7 @@
 #include <xfuncs.h>
 #include <errno.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT
 
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index 7b25adb3ac..f9b96c50a2 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -40,7 +40,7 @@
 #include <clock.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <errno.h>
 #include <progress.h>
 #include "cfi_flash.h"
diff --git a/drivers/nor/cfi_flash.h b/drivers/nor/cfi_flash.h
index 32dcc8c5e0..34a4cf8352 100644
--- a/drivers/nor/cfi_flash.h
+++ b/drivers/nor/cfi_flash.h
@@ -26,7 +26,7 @@
 
 #include <driver.h>
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <linux/mtd/mtd.h>
 
 typedef unsigned long flash_sect_t;
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 2b6d5d384c..148bdbf576 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -31,7 +31,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <linux/amba/serial.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index 2d4b842420..9ba4ca9dab 100644
--- a/drivers/serial/atmel.c
+++ b/drivers/serial/atmel.c
@@ -21,7 +21,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <linux/clk.h>
 
 /* USART3 register offsets */
diff --git a/drivers/serial/serial_altera.c b/drivers/serial/serial_altera.c
index 1148564b9e..8fd5d8a1a0 100644
--- a/drivers/serial/serial_altera.c
+++ b/drivers/serial/serial_altera.c
@@ -24,7 +24,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/nios2-io.h>
 
 struct altera_serial_priv {
diff --git a/drivers/serial/serial_altera_jtag.c b/drivers/serial/serial_altera_jtag.c
index 2e34c894a4..3e1b0cf6e1 100644
--- a/drivers/serial/serial_altera_jtag.c
+++ b/drivers/serial/serial_altera_jtag.c
@@ -27,7 +27,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/nios2-io.h>
 
 struct altera_serial_jtag_priv {
diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c
index f5546aa758..9bdc626e4d 100644
--- a/drivers/serial/serial_at91rm9200.c
+++ b/drivers/serial/serial_at91rm9200.c
@@ -30,7 +30,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/hardware.h>
 
 #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1)
diff --git a/drivers/serial/serial_blackfin.c b/drivers/serial/serial_blackfin.c
index 59b2fbb1ec..9ad55792ac 100644
--- a/drivers/serial/serial_blackfin.c
+++ b/drivers/serial/serial_blackfin.c
@@ -25,7 +25,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/blackfin.h>
 
 #define UART_IER_ERBFI		0x01
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index e3edac951f..4923dcbd94 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -24,7 +24,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <notifier.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define URXD0	0x0	/* Receiver Register */
 #define URTX0	0x40	/* Transmitter Register */
diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c
index fbbc4efdac..a3273e9602 100644
--- a/drivers/serial/serial_netx.c
+++ b/drivers/serial/serial_netx.c
@@ -26,7 +26,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 
 enum uart_regs {
 	UART_DR              = 0x00,
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 36d39cd125..1217a5f249 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -41,7 +41,7 @@
 #include <init.h>
 #include <errno.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include "serial_ns16550.h"
 #include <ns16550.h>
diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c
index 9f7b7d3b02..cb875410ea 100644
--- a/drivers/serial/serial_pl010.c
+++ b/drivers/serial/serial_pl010.c
@@ -32,7 +32,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include "serial_pl010.h"
 
 static int pl010_setbaudrate(struct console_device *cdev, int baudrate)
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 21bca12f39..3a703b6fe8 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -24,7 +24,7 @@
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/s3c24xx-generic.h>
 #include <mach/s3c24x0-iomap.h>
 
diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c
index 4264345182..1563d2a93b 100644
--- a/drivers/serial/stm-serial.c
+++ b/drivers/serial/stm-serial.c
@@ -30,7 +30,7 @@
 #include <init.h>
 #include <notifier.h>
 #include <gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
 
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 2c02d7af63..4fd82fb905 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -22,7 +22,7 @@
 #include <init.h>
 #include <driver.h>
 #include <spi/spi.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/spi.h>
 #include <asm/nios2-io.h>
 
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 5f5ccb6556..faa03b1c9e 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -33,7 +33,7 @@
 #include <clock.h>
 #include <xfuncs.h>
 #include <gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <spi/spi.h>
 #include <mach/io.h>
 #include <mach/board.h>
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index bc84e19337..3b33b669fb 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -23,7 +23,7 @@
 #include <driver.h>
 #include <spi/spi.h>
 #include <xfuncs.h>
-#include <asm/io.h>
+#include <io.h>
 #include <gpio.h>
 #include <mach/spi.h>
 #include <mach/generic.h>
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index 1e4d4b08f3..fbc6e4ecc7 100644
--- a/drivers/usb/gadget/fsl_udc.c
+++ b/drivers/usb/gadget/fsl_udc.c
@@ -5,7 +5,7 @@
 #include <usb/ch9.h>
 #include <usb/gadget.h>
 #include <usb/fsl_usb2.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/byteorder.h>
 #include <asm/mmu.h>
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 81e41d938e..77087cb6ca 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/byteorder.h>
 #include <usb/usb.h>
-#include <asm/io.h>
+#include <io.h>
 #include <malloc.h>
 #include <driver.h>
 #include <init.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 94aa356dd3..e2ce65f864 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -15,7 +15,7 @@
 #include <usb/twl4030.h>
 #include <mach/ehci.h>
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <clock.h>
 #include <gpio.h>
 #include <mach/omap3-silicon.h>
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index cae049add8..7465182a7b 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -27,7 +27,7 @@
 #include <usb/usb.h>
 #include <usb/usb_defs.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include "ohci.h"
 
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 5ac4acca30..f103101464 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -53,7 +53,7 @@
 #include <errno.h>
 
 #include <asm/byteorder.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 
 #include "ohci.h"
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 4a898fb223..6ed6f01e8e 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -17,7 +17,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <errno.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 5ae8c4b389..dce2a9e47c 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <fb.h>
 #include <mach/imxfb.h>
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index c19e83e50f..7ffbcb550b 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -16,7 +16,7 @@
 
 #include <common.h>
 #include <fb.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imxfb.h>
 #include <driver.h>
 #include <malloc.h>
diff --git a/drivers/video/s3c.c b/drivers/video/s3c.c
index d079fdea59..b17aeb69ff 100644
--- a/drivers/video/s3c.c
+++ b/drivers/video/s3c.c
@@ -29,7 +29,7 @@
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/gpio.h>
 #include <mach/s3c24xx-generic.h>
 #include <mach/fb.h>
diff --git a/drivers/video/stm.c b/drivers/video/stm.c
index 78acad7372..c109352565 100644
--- a/drivers/video/stm.c
+++ b/drivers/video/stm.c
@@ -23,7 +23,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <xfuncs.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
 #include <mach/fb.h>