diff --git a/[refs] b/[refs]
index dc31adc9c159..3bfa80c0a05f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 040f30f34f4ac6fe226992962b1f4b789a7aa551
+refs/heads/master: 93115b7fa8f4090ecbf247b29992a9454d4f9c22
diff --git a/trunk/drivers/mtd/onenand/samsung.c b/trunk/drivers/mtd/onenand/samsung.c
index 33f2a8fb8df9..2cf74085f935 100644
--- a/trunk/drivers/mtd/onenand/samsung.c
+++ b/trunk/drivers/mtd/onenand/samsung.c
@@ -23,11 +23,11 @@
 #include <linux/mtd/partitions.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 
 #include <asm/mach/flash.h>
-#include <plat/regs-onenand.h>
 
-#include <linux/io.h>
+#include "samsung.h"
 
 enum soc_type {
 	TYPE_S3C6400,
diff --git a/trunk/arch/arm/plat-samsung/include/plat/regs-onenand.h b/trunk/drivers/mtd/onenand/samsung.h
similarity index 98%
rename from trunk/arch/arm/plat-samsung/include/plat/regs-onenand.h
rename to trunk/drivers/mtd/onenand/samsung.h
index 930ea8b88ed3..c4a80e67e438 100644
--- a/trunk/arch/arm/plat-samsung/include/plat/regs-onenand.h
+++ b/trunk/drivers/mtd/onenand/samsung.h
@@ -11,8 +11,6 @@
 #ifndef __SAMSUNG_ONENAND_H__
 #define __SAMSUNG_ONENAND_H__
 
-#include <mach/hardware.h>
-
 /*
  * OneNAND Controller
  */