diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-kirkwood/addr-map.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/debug-macro.S (renamed from include/asm-arm/arch-kirkwood/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/dma.h (renamed from include/asm-arm/arch-kirkwood/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/entry-macro.S (renamed from include/asm-arm/arch-kirkwood/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/hardware.h (renamed from include/asm-arm/arch-kirkwood/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/io.h (renamed from include/asm-arm/arch-kirkwood/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/irqs.h (renamed from include/asm-arm/arch-kirkwood/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h (renamed from include/asm-arm/arch-kirkwood/kirkwood.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/memory.h (renamed from include/asm-arm/arch-mv78xx0/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/system.h (renamed from include/asm-arm/arch-mv78xx0/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/timex.h (renamed from include/asm-arm/arch-kirkwood/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/uncompress.h (renamed from include/asm-arm/arch-kirkwood/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/vmalloc.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 |
17 files changed, 25 insertions, 20 deletions
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c index 8a7ebe9ad7f1..c79f492072f9 100644 --- a/arch/arm/mach-kirkwood/addr-map.c +++ b/arch/arm/mach-kirkwood/addr-map.c @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/mbus.h> #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include "common.h" /* diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 5938a3b33cdc..0e509b8ad56e 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -19,7 +19,7 @@ #include <asm/timex.h> #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #include <asm/plat-orion/cache-feroceon-l2.h> #include <asm/plat-orion/ehci-orion.h> #include <asm/plat-orion/orion_nand.h> diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index d5c482c628e3..610fb24d8ae2 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c @@ -21,7 +21,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #include "common.h" static struct mv643xx_eth_platform_data db88f6281_ge00_data = { diff --git a/include/asm-arm/arch-kirkwood/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index f55fb8ad9ee4..c0cc5b5c82ac 100644 --- a/include/asm-arm/arch-kirkwood/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S @@ -1,12 +1,12 @@ /* - * include/asm-arm/arch-kirkwood/debug-macro.S + * arch/arm/mach-kirkwood/include/mach/debug-macro.S * * 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 * published by the Free Software Foundation. */ -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-kirkwood/dma.h b/arch/arm/mach-kirkwood/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-kirkwood/dma.h +++ b/arch/arm/mach-kirkwood/include/mach/dma.h diff --git a/include/asm-arm/arch-kirkwood/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S index fc6a43d9355c..83e0cba77b36 100644 --- a/include/asm-arm/arch-kirkwood/entry-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/entry-macro.S + * arch/arm/mach-kirkwood/include/mach/entry-macro.S * * Low-level IRQ helper macros for Marvell Kirkwood platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-kirkwood/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h index e695719771a5..cde85283f7d3 100644 --- a/include/asm-arm/arch-kirkwood/hardware.h +++ b/arch/arm/mach-kirkwood/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/hardware.h + * arch/arm/mach-kirkwood/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-kirkwood/io.h b/arch/arm/mach-kirkwood/include/mach/io.h index 0ef6e95f5d5b..be07be0ef522 100644 --- a/include/asm-arm/arch-kirkwood/io.h +++ b/arch/arm/mach-kirkwood/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/io.h + * arch/arm/mach-kirkwood/include/mach/io.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-kirkwood/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h index 2e7b5da6335c..6fd05838c72d 100644 --- a/include/asm-arm/arch-kirkwood/irqs.h +++ b/arch/arm/mach-kirkwood/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/irqs.h + * arch/arm/mach-kirkwood/include/mach/irqs.h * * IRQ definitions for Marvell Kirkwood SoCs * diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index bb31b315c350..d1336b41f0fb 100644 --- a/include/asm-arm/arch-kirkwood/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/kirkwood.h + * arch/arm/mach-kirkwood/include/mach/kirkwood.h * * Generic definitions for Marvell Kirkwood SoC flavors: * 88F6180, 88F6192 and 88F6281. diff --git a/include/asm-arm/arch-mv78xx0/memory.h b/arch/arm/mach-kirkwood/include/mach/memory.h index 721a6b185b91..b5fb34bdccd5 100644 --- a/include/asm-arm/arch-mv78xx0/memory.h +++ b/arch/arm/mach-kirkwood/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/memory.h + * arch/arm/mach-kirkwood/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-mv78xx0/system.h b/arch/arm/mach-kirkwood/include/mach/system.h index 7eb47d376db9..8510f6cfdabf 100644 --- a/include/asm-arm/arch-mv78xx0/system.h +++ b/arch/arm/mach-kirkwood/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/system.h + * arch/arm/mach-kirkwood/include/mach/system.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -9,8 +9,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/mv78xx0.h> +#include <mach/hardware.h> +#include <mach/kirkwood.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-kirkwood/timex.h b/arch/arm/mach-kirkwood/include/mach/timex.h index 82122e134e3c..f77ef4a32c5f 100644 --- a/include/asm-arm/arch-kirkwood/timex.h +++ b/arch/arm/mach-kirkwood/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/timex.h + * arch/arm/mach-kirkwood/include/mach/timex.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-kirkwood/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h index a9062b6d7680..75d5497df3a8 100644 --- a/include/asm-arm/arch-kirkwood/uncompress.h +++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/uncompress.h + * arch/arm/mach-kirkwood/include/mach/uncompress.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -7,7 +7,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) diff --git a/arch/arm/mach-kirkwood/include/mach/vmalloc.h b/arch/arm/mach-kirkwood/include/mach/vmalloc.h new file mode 100644 index 000000000000..8f48260dcdad --- /dev/null +++ b/arch/arm/mach-kirkwood/include/mach/vmalloc.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-kirkwood/include/mach/vmalloc.h + */ + +#define VMALLOC_END 0xfe800000 diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 6cf642c504d3..182230a5d198 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c @@ -21,7 +21,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #include "common.h" #define RD88F6192_GPIO_USB_VBUS 10 diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index b6437f47a77f..d8a43018c7d3 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c @@ -22,7 +22,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #include <asm/plat-orion/orion_nand.h> #include "common.h" |