Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-omap1 / flash.c

diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index 4665bfcd2ce973fcdb35d64a3c6375df110a56d2..401eb3c080c2f325de709d805aac2fc9f260c9f2 100644 (file)
--- a/arch/arm/mach-omap1/flash.c
+++ b/arch/arm/mach-omap1/flash.c
@@ -6,13 +6,15 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 
-#include <plat/io.h>
 #include <plat/tc.h>
 #include <plat/flash.h>
 
+#include <mach/hardware.h>
+
 void omap1_set_vpp(struct platform_device *pdev, int enable)
 {
        u32 l;