Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/omap16xx.h b/arch/arm/plat-omap/include/mach/omap16xx.h
similarity index 99%
rename from include/asm-arm/arch-omap/omap16xx.h
rename to arch/arm/plat-omap/include/mach/omap16xx.h
index d576e595abb77960b4c701de408220d0e4e6653e..0e69b504c25fa1231a0fc1bd0f800432b50c57c2 100644 (file)
--- a/include/asm-arm/arch-omap/omap16xx.h
+++ b/arch/arm/plat-omap/include/mach/omap16xx.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-omap/omap16xx.h
+/* arch/arm/plat-omap/include/mach/omap16xx.h
  *
  * Hardware definitions for TI OMAP1610/5912/1710 processors.
  *