diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c
index 55a631deb4..47b1f1bfe2 100644
--- a/drivers/mtd/nand/omap_elm.c
+++ b/drivers/mtd/nand/omap_elm.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <linux/mtd/omap_gpmc.h>
-#include <asm/omap_elm.h>
+#include <linux/mtd/omap_elm.h>
 #include <asm/arch/hardware.h>
 
 #define ELM_DEFAULT_POLY (0)
diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index 452e40f04e..881a63618c 100644
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -14,7 +14,7 @@
 #include <linux/bch.h>
 #include <linux/compiler.h>
 #include <nand.h>
-#include <asm/omap_elm.h>
+#include <linux/mtd/omap_elm.h>
 
 #define BADBLOCK_MARKER_LENGTH	2
 #define SECTOR_BYTES		512
diff --git a/arch/arm/include/asm/omap_elm.h b/include/linux/mtd/omap_elm.h
similarity index 100%
rename from arch/arm/include/asm/omap_elm.h
rename to include/linux/mtd/omap_elm.h