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-iop32x/include/mach/entry-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-iop32x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop32x/entry-macro.S) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-iop32x/entry-macro.S b/arch/arm/mach-iop32x/include/mach/entry-macro.S index 207db99dfbd2..b02fb56bafcc 100644 --- a/include/asm-arm/arch-iop32x/entry-macro.S +++ b/arch/arm/mach-iop32x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/entry-macro.S + * arch/arm/mach-iop32x/include/mach/entry-macro.S * * Low-level IRQ helper macros for IOP32x-based platforms * @@ -7,7 +7,7 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <asm/arch/iop32x.h> +#include <mach/iop32x.h> .macro disable_fiq .endm |