Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / autcpu12-nvram.c

diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index cf32267263df815ed07ce6dbb41bd8f96c8e81aa..53664188fc471c1ecd03952abc7b044129ea16cb 100644 (file)
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -25,8 +25,8 @@
 #include <linux/init.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/hardware.h>
-#include <asm/arch/autcpu12.h>
+#include <mach/hardware.h>
+#include <mach/autcpu12.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>