Merge branch 'for-tony-mailbox'

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

diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 47f6eb88f420a05cb5844dcd74e10d6431c9af5a..87539db7658b348c8edcb0bbcf5eb7a1d8fe6068 100644 (file)
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -13,9 +13,9 @@
 #include <linux/resource.h>
 #include <linux/interrupt.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 "omap1-mailbox"