Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / debug-macro.S

diff --git a/include/asm-arm/arch-omap/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S
similarity index 97%
rename from include/asm-arm/arch-omap/debug-macro.S
rename to arch/arm/plat-omap/include/mach/debug-macro.S
index 3866e04e2108ecd639b5a538d1ef202530d5a6ca..1b11f5c6a2d9769d4acdc543a5fba4bd1a03636d 100644 (file)
--- a/include/asm-arm/arch-omap/debug-macro.S
+++ b/arch/arm/plat-omap/include/mach/debug-macro.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-omap/debug-macro.S
+/* arch/arm/plat-omap/include/mach/debug-macro.S
  *
  * Debugging macro include header
  *