Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / system.h

diff --git a/include/asm-arm/arch-omap/system.h b/arch/arm/plat-omap/include/mach/system.h
similarity index 94%
rename from include/asm-arm/arch-omap/system.h
rename to arch/arm/plat-omap/include/mach/system.h
index 4faeb9fc7aeec224384a203678572179790d50af..61d9f36722a60db3085645080721a4f0791d0da0 100644 (file)
--- a/include/asm-arm/arch-omap/system.h
+++ b/arch/arm/plat-omap/include/mach/system.h
@@ -7,9 +7,9 @@
 #include <linux/clk.h>
 
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/prcm.h>
+#include <mach/prcm.h>
 
 #ifndef CONFIG_MACH_VOICEBLUE
 #define voiceblue_reset()              do {} while (0)