Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/clockdomain.h b/arch/arm/plat-omap/include/mach/clockdomain.h
similarity index 95%
rename from include/asm-arm/arch-omap/clockdomain.h
rename to arch/arm/plat-omap/include/mach/clockdomain.h
index b58bb73b5895b1973e10c901d43ec064185460da..b9d0dd2da89b4f4f47378e31157e895639e30d29 100644 (file)
--- a/include/asm-arm/arch-omap/clockdomain.h
+++ b/arch/arm/plat-omap/include/mach/clockdomain.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/clockdomain.h
+ * arch/arm/plat-omap/include/mach/clockdomain.h
  *
  * OMAP2/3 clockdomain framework functions
  *
@@ -16,9 +16,9 @@
 #ifndef __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H
 #define __ASM_ARM_ARCH_OMAP_CLOCKDOMAIN_H
 
-#include <asm/arch/powerdomain.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cpu.h>
+#include <mach/powerdomain.h>
+#include <mach/clock.h>
+#include <mach/cpu.h>
 
 /* Clockdomain capability flags */
 #define CLKDM_CAN_FORCE_SLEEP                  (1 << 0)