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-versatile/include/mach | |
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-versatile/include/mach/debug-macro.S (renamed from include/asm-arm/arch-versatile/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/dma.h (renamed from include/asm-arm/arch-versatile/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/entry-macro.S (renamed from include/asm-arm/arch-versatile/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/hardware.h (renamed from include/asm-arm/arch-versatile/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/io.h (renamed from include/asm-arm/arch-versatile/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/irqs.h (renamed from include/asm-arm/arch-versatile/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/memory.h (renamed from include/asm-arm/arch-versatile/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/platform.h (renamed from include/asm-arm/arch-versatile/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/system.h (renamed from include/asm-arm/arch-versatile/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/timex.h (renamed from include/asm-arm/arch-versatile/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/uncompress.h (renamed from include/asm-arm/arch-versatile/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/vmalloc.h (renamed from include/asm-arm/arch-versatile/vmalloc.h) | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/include/asm-arm/arch-versatile/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S index fe106d184e62..b4ac00eacf68 100644 --- a/include/asm-arm/arch-versatile/debug-macro.S +++ b/arch/arm/mach-versatile/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-versatile/debug-macro.S +/* arch/arm/mach-versatile/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-versatile/dma.h b/arch/arm/mach-versatile/include/mach/dma.h index 642577348623..0aabf12c8834 100644 --- a/include/asm-arm/arch-versatile/dma.h +++ b/arch/arm/mach-versatile/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/dma.h + * arch/arm/mach-versatile/include/mach/dma.h * * Copyright (C) 2003 ARM Limited. * Copyright (C) 1997,1998 Russell King diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S index cd114169c3e6..8c8020980585 100644 --- a/include/asm-arm/arch-versatile/entry-macro.S +++ b/arch/arm/mach-versatile/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-versatile/entry-macro.S + * arch/arm/mach-versatile/include/mach/entry-macro.S * * Low-level IRQ helper macros for Versatile 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/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/vic.h> .macro disable_fiq diff --git a/include/asm-arm/arch-versatile/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h index edc06598d187..7aa906c93154 100644 --- a/include/asm-arm/arch-versatile/hardware.h +++ b/arch/arm/mach-versatile/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/hardware.h + * arch/arm/mach-versatile/include/mach/hardware.h * * This file contains the hardware definitions of the Versatile boards. * @@ -23,7 +23,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * PCI space virtual addresses diff --git a/include/asm-arm/arch-versatile/io.h b/arch/arm/mach-versatile/include/mach/io.h index c4d01948e00b..c0b9dd1d0257 100644 --- a/include/asm-arm/arch-versatile/io.h +++ b/arch/arm/mach-versatile/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/io.h + * arch/arm/mach-versatile/include/mach/io.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h index f7263b99403b..216a1312e62e 100644 --- a/include/asm-arm/arch-versatile/irqs.h +++ b/arch/arm/mach-versatile/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/irqs.h + * arch/arm/mach-versatile/include/mach/irqs.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * IRQ interrupts definitions are the same as the INT definitions diff --git a/include/asm-arm/arch-versatile/memory.h b/arch/arm/mach-versatile/include/mach/memory.h index a9370976cc5e..b6315c0602ac 100644 --- a/include/asm-arm/arch-versatile/memory.h +++ b/arch/arm/mach-versatile/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/memory.h + * arch/arm/mach-versatile/include/mach/memory.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/platform.h b/arch/arm/mach-versatile/include/mach/platform.h index 2af9d7c9c63c..27cbe6a3f220 100644 --- a/include/asm-arm/arch-versatile/platform.h +++ b/arch/arm/mach-versatile/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/platform.h + * arch/arm/mach-versatile/include/mach/platform.h * * Copyright (c) ARM Limited 2003. All rights reserved. * diff --git a/include/asm-arm/arch-versatile/system.h b/arch/arm/mach-versatile/include/mach/system.h index 3ea4e07b58c8..91fa559c7cca 100644 --- a/include/asm-arm/arch-versatile/system.h +++ b/arch/arm/mach-versatile/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/system.h + * arch/arm/mach-versatile/include/mach/system.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd @@ -21,9 +21,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-versatile/timex.h b/arch/arm/mach-versatile/include/mach/timex.h index 38fd04fc9141..426199b1add5 100644 --- a/include/asm-arm/arch-versatile/timex.h +++ b/arch/arm/mach-versatile/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/timex.h + * arch/arm/mach-versatile/include/mach/timex.h * * Versatile architecture timex specifications * diff --git a/include/asm-arm/arch-versatile/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h index 7215133d0514..3dd0048afb34 100644 --- a/include/asm-arm/arch-versatile/uncompress.h +++ b/arch/arm/mach-versatile/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/uncompress.h + * arch/arm/mach-versatile/include/mach/uncompress.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/vmalloc.h b/arch/arm/mach-versatile/include/mach/vmalloc.h index ac780df62156..427e3612db5d 100644 --- a/include/asm-arm/arch-versatile/vmalloc.h +++ b/arch/arm/mach-versatile/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/vmalloc.h + * arch/arm/mach-versatile/include/mach/vmalloc.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Russell King. |