Merge branch 'for-tony-mailbox'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mailbox.c

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 571aea7166aaf6bc6219b1cfb7f22436e8d314cb..544dde9d07b254b546c87134d875025db702855f 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -14,9 +14,9 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 #include <mach/mailbox.h>
 #include <mach/irqs.h>
-#include <asm/io.h>
 
 #define DRV_NAME "omap2-mailbox"