11 files changed, 11 insertions, 11 deletions
diff --git a/src/cpu/allwinner/a10/clock.c b/src/cpu/allwinner/a10/clock.c
index 8f64f06bc0..76198b76ba 100644
--- a/src/cpu/allwinner/a10/clock.c
+++ b/src/cpu/allwinner/a10/clock.c
@@ -18,7 +18,7 @@
 
 #include "clock.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
 #include <lib.h>
diff --git a/src/cpu/allwinner/a10/gpio.c b/src/cpu/allwinner/a10/gpio.c
index 1614c5f960..7f6bbd8549 100644
--- a/src/cpu/allwinner/a10/gpio.c
+++ b/src/cpu/allwinner/a10/gpio.c
@@ -18,7 +18,7 @@
 
 #include "gpio.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct a10_gpio *const gpio = (void *)GPIO_BASE;
 
diff --git a/src/cpu/allwinner/a10/pinmux.c b/src/cpu/allwinner/a10/pinmux.c
index b8bf607432..3415e4fed5 100644
--- a/src/cpu/allwinner/a10/pinmux.c
+++ b/src/cpu/allwinner/a10/pinmux.c
@@ -20,7 +20,7 @@
 
 #include "gpio.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct a10_gpio *const gpio = (void *)GPIO_BASE;
 
diff --git a/src/cpu/allwinner/a10/raminit.c b/src/cpu/allwinner/a10/raminit.c
index f7d66d5dd3..3c18183a6b 100644
--- a/src/cpu/allwinner/a10/raminit.c
+++ b/src/cpu/allwinner/a10/raminit.c
@@ -29,7 +29,7 @@
 #include "memmap.h"
 #include "timer.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 
 static struct a1x_dramc *const dram = (void *)A1X_DRAMC_BASE;
diff --git a/src/cpu/allwinner/a10/timer.c b/src/cpu/allwinner/a10/timer.c
index 3eacf54bae..c91d492171 100644
--- a/src/cpu/allwinner/a10/timer.c
+++ b/src/cpu/allwinner/a10/timer.c
@@ -19,7 +19,7 @@
 
 #include "timer.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <timer.h>
 
diff --git a/src/cpu/allwinner/a10/twi.c b/src/cpu/allwinner/a10/twi.c
index 6601db3dde..6e7f9e214a 100644
--- a/src/cpu/allwinner/a10/twi.c
+++ b/src/cpu/allwinner/a10/twi.c
@@ -23,7 +23,7 @@
 #include "memmap.h"
 #include "twi.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <device/i2c_simple.h>
 
diff --git a/src/cpu/allwinner/a10/uart.c b/src/cpu/allwinner/a10/uart.c
index 9bcedeb49e..c721a67b07 100644
--- a/src/cpu/allwinner/a10/uart.c
+++ b/src/cpu/allwinner/a10/uart.c
@@ -19,7 +19,7 @@
  */
 
 #include "uart.h"
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 
diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
index e8ab17518b..783675d953 100644
--- a/src/cpu/amd/microcode/microcode.c
+++ b/src/cpu/amd/microcode/microcode.c
@@ -20,7 +20,7 @@
 #include <cpu/amd/msr.h>
 #include <cpu/amd/microcode.h>
 #include <cbfs.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <smp/spinlock.h>
 
 #define UCODE_DEBUG(fmt, args...)	\
diff --git a/src/cpu/ti/am335x/gpio.c b/src/cpu/ti/am335x/gpio.c
index bfbbbd2698..e1c696709b 100644
--- a/src/cpu/ti/am335x/gpio.c
+++ b/src/cpu/ti/am335x/gpio.c
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <cpu/ti/am335x/gpio.h>
 #include <stdint.h>
diff --git a/src/cpu/ti/am335x/pinmux.c b/src/cpu/ti/am335x/pinmux.c
index 1e45142145..71e9cadb58 100644
--- a/src/cpu/ti/am335x/pinmux.c
+++ b/src/cpu/ti/am335x/pinmux.c
@@ -15,7 +15,7 @@
 
 #include "pinmux.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct am335x_pinmux_regs *regs =
 	(struct am335x_pinmux_regs *)(uintptr_t)AM335X_PINMUX_REG_ADDR;
diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c
index 38a13ac268..c482a85d74 100644
--- a/src/cpu/ti/am335x/uart.c
+++ b/src/cpu/ti/am335x/uart.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <types.h>
 #include <console/uart.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <cpu/ti/am335x/uart.h>