diff options
author | 2008-08-05 16:14:15 +0100 | |
---|---|---|
committer | 2008-08-07 09:55:48 +0100 | |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/mach-orion5x/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-orion5x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-orion5x/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/dma.h (renamed from include/asm-arm/arch-orion5x/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-orion5x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/gpio.h (renamed from include/asm-arm/arch-orion5x/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/hardware.h (renamed from include/asm-arm/arch-orion5x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/io.h (renamed from include/asm-arm/arch-orion5x/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/irqs.h (renamed from include/asm-arm/arch-orion5x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/memory.h (renamed from include/asm-arm/arch-orion5x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/orion5x.h (renamed from include/asm-arm/arch-orion5x/orion5x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/system.h (renamed from include/asm-arm/arch-orion5x/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/timex.h (renamed from include/asm-arm/arch-orion5x/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/uncompress.h (renamed from include/asm-arm/arch-orion5x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 |
13 files changed, 21 insertions, 16 deletions
diff --git a/include/asm-arm/arch-orion5x/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S index 4f98f3ba2929..c7f808bfe272 100644 --- a/include/asm-arm/arch-orion5x/debug-macro.S +++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/debug-macro.S + * arch/arm/mach-orion5x/include/mach/debug-macro.S * * Debugging macro include header * @@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-orion5x/dma.h b/arch/arm/mach-orion5x/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-orion5x/dma.h +++ b/arch/arm/mach-orion5x/include/mach/dma.h diff --git a/include/asm-arm/arch-orion5x/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S index d8ef54c0ee9a..4351937035cd 100644 --- a/include/asm-arm/arch-orion5x/entry-macro.S +++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/entry-macro.S + * arch/arm/mach-orion5x/include/mach/entry-macro.S * * Low-level IRQ helper macros for Orion platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-orion5x/gpio.h b/arch/arm/mach-orion5x/include/mach/gpio.h index c85e498388b6..65dc136a86f7 100644 --- a/include/asm-arm/arch-orion5x/gpio.h +++ b/arch/arm/mach-orion5x/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/gpio.h + * arch/arm/mach-orion5x/include/mach/gpio.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-orion5x/hardware.h b/arch/arm/mach-orion5x/include/mach/hardware.h index 5d2d8e0b5630..e51aaf4bf2b5 100644 --- a/include/asm-arm/arch-orion5x/hardware.h +++ b/arch/arm/mach-orion5x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/hardware.h + * arch/arm/mach-orion5x/include/mach/hardware.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/include/asm-arm/arch-orion5x/io.h b/arch/arm/mach-orion5x/include/mach/io.h index 59f1bc96a23b..f24b2513f7f3 100644 --- a/include/asm-arm/arch-orion5x/io.h +++ b/arch/arm/mach-orion5x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/io.h + * arch/arm/mach-orion5x/include/mach/io.h * * Tzachi Perelstein <tzachi@marvell.com> * diff --git a/include/asm-arm/arch-orion5x/irqs.h b/arch/arm/mach-orion5x/include/mach/irqs.h index abdd61a4833a..d5b0fbf6b965 100644 --- a/include/asm-arm/arch-orion5x/irqs.h +++ b/arch/arm/mach-orion5x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/irqs.h + * arch/arm/mach-orion5x/include/mach/irqs.h * * IRQ definitions for Orion SoC * diff --git a/include/asm-arm/arch-orion5x/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h index 80053a7afc7a..54dd76b013f2 100644 --- a/include/asm-arm/arch-orion5x/memory.h +++ b/arch/arm/mach-orion5x/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/memory.h + * arch/arm/mach-orion5x/include/mach/memory.h * * Marvell Orion memory definitions */ diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index 10257f5c5e9e..f52a7d65bec2 100644 --- a/include/asm-arm/arch-orion5x/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/orion5x.h + * arch/arm/mach-orion5x/include/mach/orion5x.h * * Generic definitions of Orion SoC flavors: * Orion-1, Orion-VoIP, Orion-NAS, and Orion-2. diff --git a/include/asm-arm/arch-orion5x/system.h b/arch/arm/mach-orion5x/include/mach/system.h index 3f1d1e2d38f8..08e430757890 100644 --- a/include/asm-arm/arch-orion5x/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/system.h + * arch/arm/mach-orion5x/include/mach/system.h * * Tzachi Perelstein <tzachi@marvell.com> * @@ -11,8 +11,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/orion5x.h> +#include <mach/hardware.h> +#include <mach/orion5x.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-orion5x/timex.h b/arch/arm/mach-orion5x/include/mach/timex.h index 31c568e28cc3..e82e44db7629 100644 --- a/include/asm-arm/arch-orion5x/timex.h +++ b/arch/arm/mach-orion5x/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/timex.h + * arch/arm/mach-orion5x/include/mach/timex.h * * Tzachi Perelstein <tzachi@marvell.com> * diff --git a/include/asm-arm/arch-orion5x/uncompress.h b/arch/arm/mach-orion5x/include/mach/uncompress.h index 7548cedf2d76..4322dba468a4 100644 --- a/include/asm-arm/arch-orion5x/uncompress.h +++ b/arch/arm/mach-orion5x/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/uncompress.h + * arch/arm/mach-orion5x/include/mach/uncompress.h * * Tzachi Perelstein <tzachi@marvell.com> * @@ -9,7 +9,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) diff --git a/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h new file mode 100644 index 000000000000..7147a297e97f --- /dev/null +++ b/arch/arm/mach-orion5x/include/mach/vmalloc.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-orion5x/include/mach/vmalloc.h + */ + +#define VMALLOC_END 0xfd800000 |