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 /include/asm-arm/arch-ixp23xx/memory.h | |
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-ixp23xx/include/mach/memory.h (renamed from include/asm-arm/arch-ixp23xx/memory.h) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/arch/arm/mach-ixp23xx/include/mach/memory.h index c3d906af9fea..9d40115f7ebe 100644 --- a/include/asm-arm/arch-ixp23xx/memory.h +++ b/arch/arm/mach-ixp23xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/memory.h + * arch/arm/mach-ixp23xx/include/mach/memory.h * * Copyright (c) 2003-2004 Intel Corp. * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. |