diff --git a/[refs] b/[refs]
index 79d0d799fd7e..2353beeba77a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe875358a6cd01c4599e321dd6dc767b11c42eac
+refs/heads/master: cbbd695687caab1082a70d2ae81153fdba7e851c
diff --git a/trunk/drivers/mtd/onenand/omap2.c b/trunk/drivers/mtd/onenand/omap2.c
index 28034ef08a82..a7e4d985f5ef 100644
--- a/trunk/drivers/mtd/onenand/omap2.c
+++ b/trunk/drivers/mtd/onenand/omap2.c
@@ -32,16 +32,15 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/mach/flash.h>
 #include <mach/gpmc.h>
 #include <mach/onenand.h>
 #include <mach/gpio.h>
 #include <mach/pm.h>
 
-#include <linux/dma-mapping.h>
-#include <asm/dma-mapping.h>
 #include <mach/dma.h>
 
 #include <mach/board.h>