Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/prcm.h b/arch/arm/plat-omap/include/mach/prcm.h
similarity index 96%
rename from include/asm-arm/arch-omap/prcm.h
rename to arch/arm/plat-omap/include/mach/prcm.h
index 9a772a94999881533f966492f999d0351f137df3..80dddcb970cfdd5e143d1ca46e3553cc9c890a72 100644 (file)
--- a/include/asm-arm/arch-omap/prcm.h
+++ b/arch/arm/plat-omap/include/mach/prcm.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/prcm.h
+ * arch/arm/plat-omap/include/mach/prcm.h
  *
  * Access definations for use in OMAP24XX clock and power management
  *