Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/powerdomain.h b/arch/arm/plat-omap/include/mach/powerdomain.h
similarity index 99%
rename from include/asm-arm/arch-omap/powerdomain.h
rename to arch/arm/plat-omap/include/mach/powerdomain.h
index 0e794594404f38b6d9a02529f12ae7dc73785be3..4948cb7af5bfe4147c10106610ff3e253296c3ed 100644 (file)
--- a/include/asm-arm/arch-omap/powerdomain.h
+++ b/arch/arm/plat-omap/include/mach/powerdomain.h
@@ -19,7 +19,7 @@
 
 #include <asm/atomic.h>
 
-#include <asm/arch/cpu.h>
+#include <mach/cpu.h>
 
 
 /* Powerdomain basic power states */