Merge branch 'linus' into stackprotector

[karo-tx-linux.git] / arch / arm / plat-omap / mux.c

diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 847df208c46ca78db749fd0aad8605ab53a9aa5d..80b040fd5ca79fc55cb8ba42111596be48ce10bc 100644 (file)
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -25,8 +25,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/io.h>
 #include <asm/system.h>
-#include <asm/io.h>
 #include <linux/spinlock.h>
 #include <mach/mux.h>