Merge commit 'v2.6.27-rc8' into x86/setup

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / ipaq-flash.c

diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
index a806119797e0feeb3fd2969199a334daa6aa9c21..ed58f6a77bd92771d118223f6a31825a831bb7b3 100644 (file)
--- a/drivers/mtd/maps/ipaq-flash.c
+++ b/drivers/mtd/maps/ipaq-flash.c
@@ -24,8 +24,8 @@
 #include <linux/mtd/concat.h>
 #endif
 
-#include <asm/hardware.h>
-#include <asm/arch-sa1100/h3600.h>
+#include <mach/hardware.h>
+#include <mach/h3600.h>
 #include <asm/io.h>