Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
similarity index 99%
rename from include/asm-arm/arch-omap/cpu.h
rename to arch/arm/plat-omap/include/mach/cpu.h
index 33f26e93f5f87184bec5b3a098f72e8e1f8502ef..e0464187209dcc9d4227267e251944b1e7cd7337 100644 (file)
--- a/include/asm-arm/arch-omap/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/cpu.h
+ * arch/arm/plat-omap/include/mach/cpu.h
  *
  * OMAP cpu type detection
  *