diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 16:14:15 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:55:48 +0100 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/mach-sa1100/include/mach/debug-macro.S | |
parent | Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 (diff) | |
download | linux-dev-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.xz linux-dev-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.zip |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/debug-macro.S (renamed from include/asm-arm/arch-sa1100/debug-macro.S) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-sa1100/debug-macro.S b/arch/arm/mach-sa1100/include/mach/debug-macro.S index 1b7753654bd4..1f0634d92702 100644 --- 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 |