[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

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

diff --git a/include/asm-arm/arch-sa1100/debug-macro.S b/arch/arm/mach-sa1100/include/mach/debug-macro.S
similarity index 90%
rename from include/asm-arm/arch-sa1100/debug-macro.S
rename to arch/arm/mach-sa1100/include/mach/debug-macro.S
index 1b7753654bd44926207bd53d1bc59610131cf69b..1f0634d92702a29c3540d59356d5cc5afd841e85 100644 (file)
--- a/include/asm-arm/arch-sa1100/debug-macro.S
+++ b/arch/arm/mach-sa1100/include/mach/debug-macro.S
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-sa1100/debug-macro.S
+/* arch/arm/mach-sa1100/include/mach/debug-macro.S
  *
  * Debugging macro include header
  *
@@ -10,7 +10,7 @@
  * published by the Free Software Foundation.
  *
 */
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
                .macro  addruart,rx
                mrc     p15, 0, \rx, c1, c0
@@ -19,7 +19,7 @@
                movne   \rx, #0xf8000000        @ virtual address
 
                @ We probe for the active serial port here, coherently with
-               @ the comment in include/asm-arm/arch-sa1100/uncompress.h.
+               @ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h.
                @ We assume r1 can be clobbered.
 
                @ see if Ser3 is active