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-ebsa110 | |
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-ebsa110/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ebsa110/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/dma.h (renamed from include/asm-arm/arch-ebsa110/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ebsa110/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/hardware.h (renamed from include/asm-arm/arch-ebsa110/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/io.h (renamed from include/asm-arm/arch-ebsa110/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/irqs.h (renamed from include/asm-arm/arch-ebsa110/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/memory.h (renamed from include/asm-arm/arch-ebsa110/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/system.h (renamed from include/asm-arm/arch-ebsa110/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/timex.h (renamed from include/asm-arm/arch-ebsa110/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/uncompress.h (renamed from include/asm-arm/arch-ebsa110/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ebsa110/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/io.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/leds.c | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 31f4f213cce3..65cc7c271917 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c @@ -15,7 +15,7 @@ #include <linux/serial_8250.h> #include <linux/init.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/setup.h> diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S index 9213bfe4831d..1dde8227f3a2 100644 --- a/include/asm-arm/arch-ebsa110/debug-macro.S +++ b/arch/arm/mach-ebsa110/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-ebsa110/debug-macro.S +/* arch/arm/mach-ebsa110/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-ebsa110/dma.h b/arch/arm/mach-ebsa110/include/mach/dma.h index c52f9e2ab0bb..780a04c8bbe9 100644 --- a/include/asm-arm/arch-ebsa110/dma.h +++ b/arch/arm/mach-ebsa110/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/dma.h + * arch/arm/mach-ebsa110/include/mach/dma.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/entry-macro.S b/arch/arm/mach-ebsa110/include/mach/entry-macro.S index f242be5c49ba..cc3e5992f6b3 100644 --- a/include/asm-arm/arch-ebsa110/entry-macro.S +++ b/arch/arm/mach-ebsa110/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ebsa110/entry-macro.S + * arch/arm/mach-ebsa110/include/mach/entry-macro.S * * Low-level IRQ helper macros for ebsa110 platform. * diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/arch/arm/mach-ebsa110/include/mach/hardware.h index 3ce864def41e..4b2fb7743909 100644 --- a/include/asm-arm/arch-ebsa110/hardware.h +++ b/arch/arm/mach-ebsa110/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/hardware.h + * arch/arm/mach-ebsa110/include/mach/hardware.h * * Copyright (C) 1996-2000 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/io.h b/arch/arm/mach-ebsa110/include/mach/io.h index 44a4001de807..f68daa632af0 100644 --- a/include/asm-arm/arch-ebsa110/io.h +++ b/arch/arm/mach-ebsa110/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/io.h + * arch/arm/mach-ebsa110/include/mach/io.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/irqs.h b/arch/arm/mach-ebsa110/include/mach/irqs.h index ded9bd9d7b8b..a8f3771bc060 100644 --- a/include/asm-arm/arch-ebsa110/irqs.h +++ b/arch/arm/mach-ebsa110/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/irqs.h + * arch/arm/mach-ebsa110/include/mach/irqs.h * * Copyright (C) 1996 Russell King * diff --git a/include/asm-arm/arch-ebsa110/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h index c7c500e176d0..eea4b75b657b 100644 --- a/include/asm-arm/arch-ebsa110/memory.h +++ b/arch/arm/mach-ebsa110/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/memory.h + * arch/arm/mach-ebsa110/include/mach/memory.h * * Copyright (C) 1996-1999 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/system.h b/arch/arm/mach-ebsa110/include/mach/system.h index d7c8fece0bc5..350a028997ef 100644 --- a/include/asm-arm/arch-ebsa110/system.h +++ b/arch/arm/mach-ebsa110/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/system.h + * arch/arm/mach-ebsa110/include/mach/system.h * * Copyright (C) 1996-2000 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/timex.h b/arch/arm/mach-ebsa110/include/mach/timex.h index 1e9ef045092b..4fb43b22a102 100644 --- a/include/asm-arm/arch-ebsa110/timex.h +++ b/arch/arm/mach-ebsa110/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/timex.h + * arch/arm/mach-ebsa110/include/mach/timex.h * * Copyright (C) 1997, 1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/arch/arm/mach-ebsa110/include/mach/uncompress.h index ae5b775eb0b7..32041509fbf8 100644 --- a/include/asm-arm/arch-ebsa110/uncompress.h +++ b/arch/arm/mach-ebsa110/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/uncompress.h + * arch/arm/mach-ebsa110/include/mach/uncompress.h * * Copyright (C) 1996,1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/vmalloc.h b/arch/arm/mach-ebsa110/include/mach/vmalloc.h index 26674ba4683c..9b44c19e95ec 100644 --- a/include/asm-arm/arch-ebsa110/vmalloc.h +++ b/arch/arm/mach-ebsa110/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/vmalloc.h + * arch/arm/mach-ebsa110/include/mach/vmalloc.h * * Copyright (C) 1998 Russell King * diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c index a2027adeefcb..53748f5462e9 100644 --- a/arch/arm/mach-ebsa110/io.c +++ b/arch/arm/mach-ebsa110/io.c @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/page.h> diff --git a/arch/arm/mach-ebsa110/leds.c b/arch/arm/mach-ebsa110/leds.c index b16d01679772..6a6ea57c2a4e 100644 --- a/arch/arm/mach-ebsa110/leds.c +++ b/arch/arm/mach-ebsa110/leds.c @@ -15,7 +15,7 @@ #include <linux/spinlock.h> #include <linux/init.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/leds.h> #include <asm/system.h> #include <asm/mach-types.h> |