diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-realview/include/mach/board-eb.h (renamed from include/asm-arm/arch-realview/board-eb.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/board-pb1176.h (renamed from include/asm-arm/arch-realview/board-pb1176.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/board-pb11mp.h (renamed from include/asm-arm/arch-realview/board-pb11mp.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/debug-macro.S (renamed from include/asm-arm/arch-realview/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/dma.h (renamed from include/asm-arm/arch-realview/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/entry-macro.S (renamed from include/asm-arm/arch-realview/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/hardware.h (renamed from include/asm-arm/arch-realview/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/io.h (renamed from include/asm-arm/arch-realview/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/irqs.h (renamed from include/asm-arm/arch-realview/irqs.h) | 8 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/memory.h (renamed from include/asm-arm/arch-realview/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/platform.h (renamed from include/asm-arm/arch-realview/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/scu.h (renamed from include/asm-arm/arch-realview/scu.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/smp.h (renamed from include/asm-arm/arch-realview/smp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/system.h (renamed from include/asm-arm/arch-realview/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/timex.h (renamed from include/asm-arm/arch-realview/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/uncompress.h (renamed from include/asm-arm/arch-realview/uncompress.h) | 10 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/vmalloc.h (renamed from include/asm-arm/arch-realview/vmalloc.h) | 2 |
17 files changed, 28 insertions, 28 deletions
diff --git a/include/asm-arm/arch-realview/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h index 206f7a752882..8d699fd324d0 100644 --- a/include/asm-arm/arch-realview/board-eb.h +++ b/arch/arm/mach-realview/include/mach/board-eb.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-realview/board-eb.h + * arch/arm/mach-realview/include/mach/board-eb.h * * Copyright (C) 2007 ARM Limited * @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_EB_H #define __ASM_ARCH_BOARD_EB_H -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * RealView EB + ARM11MPCore peripheral addresses diff --git a/include/asm-arm/arch-realview/board-pb1176.h b/arch/arm/mach-realview/include/mach/board-pb1176.h index 48ce9c833705..858eea7b1adc 100644 --- a/include/asm-arm/arch-realview/board-pb1176.h +++ b/arch/arm/mach-realview/include/mach/board-pb1176.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-realview/board-pb1176.h + * arch/arm/mach-realview/include/mach/board-pb1176.h * * Copyright (C) 2008 ARM Limited * @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_PB1176_H #define __ASM_ARCH_BOARD_PB1176_H -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * Peripheral addresses diff --git a/include/asm-arm/arch-realview/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h index a1294d915fa8..ecd80e58631e 100644 --- a/include/asm-arm/arch-realview/board-pb11mp.h +++ b/arch/arm/mach-realview/include/mach/board-pb11mp.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-realview/board-pb11mp.h + * arch/arm/mach-realview/include/mach/board-pb11mp.h * * Copyright (C) 2008 ARM Limited * @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_BOARD_PB11MP_H #define __ASM_ARCH_BOARD_PB11MP_H -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * Peripheral addresses diff --git a/include/asm-arm/arch-realview/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index c8c860c3c26e..7196bcadff0c 100644 --- a/include/asm-arm/arch-realview/debug-macro.S +++ b/arch/arm/mach-realview/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-realview/debug-macro.S +/* arch/arm/mach-realview/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-realview/dma.h b/arch/arm/mach-realview/include/mach/dma.h index 8342e3f9d6ec..f1a5a1a10952 100644 --- a/include/asm-arm/arch-realview/dma.h +++ b/arch/arm/mach-realview/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/dma.h + * arch/arm/mach-realview/include/mach/dma.h * * Copyright (C) 2003 ARM Limited. * Copyright (C) 1997,1998 Russell King diff --git a/include/asm-arm/arch-realview/entry-macro.S b/arch/arm/mach-realview/include/mach/entry-macro.S index 31a39a7cdaa9..340a5c276946 100644 --- a/include/asm-arm/arch-realview/entry-macro.S +++ b/arch/arm/mach-realview/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-realview/entry-macro.S + * arch/arm/mach-realview/include/mach/entry-macro.S * * Low-level IRQ helper macros for RealView 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/gic.h> .macro disable_fiq diff --git a/include/asm-arm/arch-realview/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h index 1ee8313ceb6a..79a93b3dfca9 100644 --- a/include/asm-arm/arch-realview/hardware.h +++ b/arch/arm/mach-realview/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/hardware.h + * arch/arm/mach-realview/include/mach/hardware.h * * This file contains the hardware definitions of the RealView boards. * diff --git a/include/asm-arm/arch-realview/io.h b/arch/arm/mach-realview/include/mach/io.h index c70f1dfbe135..aa069424d310 100644 --- a/include/asm-arm/arch-realview/io.h +++ b/arch/arm/mach-realview/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/io.h + * arch/arm/mach-realview/include/mach/io.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-realview/irqs.h b/arch/arm/mach-realview/include/mach/irqs.h index ccbac59235c6..02a918529db3 100644 --- a/include/asm-arm/arch-realview/irqs.h +++ b/arch/arm/mach-realview/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/irqs.h + * arch/arm/mach-realview/include/mach/irqs.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. @@ -22,9 +22,9 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H -#include <asm/arch/board-eb.h> -#include <asm/arch/board-pb11mp.h> -#include <asm/arch/board-pb1176.h> +#include <mach/board-eb.h> +#include <mach/board-pb11mp.h> +#include <mach/board-pb1176.h> #define IRQ_LOCALTIMER 29 #define IRQ_LOCALWDOG 30 diff --git a/include/asm-arm/arch-realview/memory.h b/arch/arm/mach-realview/include/mach/memory.h index ed370abb638f..0e673483a141 100644 --- a/include/asm-arm/arch-realview/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/memory.h + * arch/arm/mach-realview/include/mach/memory.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-realview/platform.h b/arch/arm/mach-realview/include/mach/platform.h index 424c0aaf46a0..4034b54950c2 100644 --- a/include/asm-arm/arch-realview/platform.h +++ b/arch/arm/mach-realview/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/platform.h + * arch/arm/mach-realview/include/mach/platform.h * * Copyright (c) ARM Limited 2003. All rights reserved. * diff --git a/include/asm-arm/arch-realview/scu.h b/arch/arm/mach-realview/include/mach/scu.h index d55802d645af..d55802d645af 100644 --- a/include/asm-arm/arch-realview/scu.h +++ b/arch/arm/mach-realview/include/mach/scu.h diff --git a/include/asm-arm/arch-realview/smp.h b/arch/arm/mach-realview/include/mach/smp.h index 515819efd046..515819efd046 100644 --- a/include/asm-arm/arch-realview/smp.h +++ b/arch/arm/mach-realview/include/mach/smp.h diff --git a/include/asm-arm/arch-realview/system.h b/arch/arm/mach-realview/include/mach/system.h index bff3d3fcf846..4d3c8f3f8053 100644 --- a/include/asm-arm/arch-realview/system.h +++ b/arch/arm/mach-realview/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/system.h + * arch/arm/mach-realview/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-realview/timex.h b/arch/arm/mach-realview/include/mach/timex.h index 5b9d82d0a5e0..4eeb069373c2 100644 --- a/include/asm-arm/arch-realview/timex.h +++ b/arch/arm/mach-realview/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/timex.h + * arch/arm/mach-realview/include/mach/timex.h * * RealView architecture timex specifications * diff --git a/include/asm-arm/arch-realview/uncompress.h b/arch/arm/mach-realview/include/mach/uncompress.h index 3f7ae2e0260d..79f50f218e77 100644 --- a/include/asm-arm/arch-realview/uncompress.h +++ b/arch/arm/mach-realview/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/uncompress.h + * arch/arm/mach-realview/include/mach/uncompress.h * * Copyright (C) 2003 ARM Limited * @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> -#include <asm/arch/board-eb.h> -#include <asm/arch/board-pb11mp.h> -#include <asm/arch/board-pb1176.h> +#include <mach/board-eb.h> +#include <mach/board-pb11mp.h> +#include <mach/board-pb1176.h> #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) diff --git a/include/asm-arm/arch-realview/vmalloc.h b/arch/arm/mach-realview/include/mach/vmalloc.h index 0ad49af186af..48cbcc873db2 100644 --- a/include/asm-arm/arch-realview/vmalloc.h +++ b/arch/arm/mach-realview/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-realview/vmalloc.h + * arch/arm/mach-realview/include/mach/vmalloc.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Russell King. |