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-pnx4008/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-pnx4008/include/mach/clock.h (renamed from include/asm-arm/arch-pnx4008/clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/debug-macro.S (renamed from include/asm-arm/arch-pnx4008/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/dma.h (renamed from include/asm-arm/arch-pnx4008/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/entry-macro.S (renamed from include/asm-arm/arch-pnx4008/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/gpio.h (renamed from include/asm-arm/arch-pnx4008/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/hardware.h (renamed from include/asm-arm/arch-pnx4008/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/i2c.h (renamed from include/asm-arm/arch-pnx4008/i2c.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/io.h (renamed from include/asm-arm/arch-pnx4008/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/irq.h (renamed from include/asm-arm/arch-pnx4008/irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/irqs.h (renamed from include/asm-arm/arch-pnx4008/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/memory.h (renamed from include/asm-arm/arch-pnx4008/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/param.h (renamed from include/asm-arm/arch-pnx4008/param.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/platform.h (renamed from include/asm-arm/arch-pnx4008/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/pm.h (renamed from include/asm-arm/arch-pnx4008/pm.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/system.h (renamed from include/asm-arm/arch-pnx4008/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/timex.h (renamed from include/asm-arm/arch-pnx4008/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/uncompress.h (renamed from include/asm-arm/arch-pnx4008/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/vmalloc.h (renamed from include/asm-arm/arch-pnx4008/vmalloc.h) | 2 |
18 files changed, 21 insertions, 21 deletions
diff --git a/include/asm-arm/arch-pnx4008/clock.h b/arch/arm/mach-pnx4008/include/mach/clock.h index ce155e161269..8d2a5ef52c90 100644 --- a/include/asm-arm/arch-pnx4008/clock.h +++ b/arch/arm/mach-pnx4008/include/mach/clock.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/clock.h + * arch/arm/mach-pnx4008/include/mach/clock.h * * Clock control driver for PNX4008 - header file * diff --git a/include/asm-arm/arch-pnx4008/debug-macro.S b/arch/arm/mach-pnx4008/include/mach/debug-macro.S index 67d18a203d23..6d1407f319f8 100644 --- a/include/asm-arm/arch-pnx4008/debug-macro.S +++ b/arch/arm/mach-pnx4008/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-pnx4008/debug-macro.S +/* arch/arm/mach-pnx4008/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-pnx4008/dma.h b/arch/arm/mach-pnx4008/include/mach/dma.h index 418f15283ff1..5442d04fc575 100644 --- a/include/asm-arm/arch-pnx4008/dma.h +++ b/arch/arm/mach-pnx4008/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/dma.h + * arch/arm/mach-pnx4008/include/mach/dma.h * * PNX4008 DMA header file * diff --git a/include/asm-arm/arch-pnx4008/entry-macro.S b/arch/arm/mach-pnx4008/include/mach/entry-macro.S index f11731974e5d..8003037578ed 100644 --- a/include/asm-arm/arch-pnx4008/entry-macro.S +++ b/arch/arm/mach-pnx4008/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/entry-macro.S + * arch/arm/mach-pnx4008/include/mach/entry-macro.S * * Low-level IRQ helper macros for PNX4008-based platforms * diff --git a/include/asm-arm/arch-pnx4008/gpio.h b/arch/arm/mach-pnx4008/include/mach/gpio.h index d01bf83d55c2..9591467eb9ec 100644 --- a/include/asm-arm/arch-pnx4008/gpio.h +++ b/arch/arm/mach-pnx4008/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/gpio.h + * arch/arm/mach-pnx4008/include/mach/gpio.h * * PNX4008 GPIO driver - header file * diff --git a/include/asm-arm/arch-pnx4008/hardware.h b/arch/arm/mach-pnx4008/include/mach/hardware.h index a4410397a921..7b98b828d368 100644 --- a/include/asm-arm/arch-pnx4008/hardware.h +++ b/arch/arm/mach-pnx4008/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/hardware.h + * arch/arm/mach-pnx4008/include/mach/hardware.h * * Copyright (c) 2005 MontaVista Software, Inc. <source@mvista.com> * @@ -21,7 +21,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> /* Start of virtual addresses for IO devices */ #define IO_BASE 0xF0000000 diff --git a/include/asm-arm/arch-pnx4008/i2c.h b/arch/arm/mach-pnx4008/include/mach/i2c.h index 92e8d65006f7..92e8d65006f7 100644 --- a/include/asm-arm/arch-pnx4008/i2c.h +++ b/arch/arm/mach-pnx4008/include/mach/i2c.h diff --git a/include/asm-arm/arch-pnx4008/io.h b/arch/arm/mach-pnx4008/include/mach/io.h index 29ee43955c52..c6206f25839d 100644 --- a/include/asm-arm/arch-pnx4008/io.h +++ b/arch/arm/mach-pnx4008/include/mach/io.h @@ -1,6 +1,6 @@ /* - * include/asm-arm/arch-pnx4008/io.h + * arch/arm/mach-pnx4008/include/mach/io.h * * Author: Dmitry Chigirev <chigirev@ru.mvista.com> * diff --git a/include/asm-arm/arch-pnx4008/irq.h b/arch/arm/mach-pnx4008/include/mach/irq.h index fabff5dc337f..2a690ca33870 100644 --- a/include/asm-arm/arch-pnx4008/irq.h +++ b/arch/arm/mach-pnx4008/include/mach/irq.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/irq.h + * arch/arm/mach-pnx4008/include/mach/irq.h * * PNX4008 IRQ controller driver - header file * this one is used in entry-arnv.S as well so it cannot contain C code diff --git a/include/asm-arm/arch-pnx4008/irqs.h b/arch/arm/mach-pnx4008/include/mach/irqs.h index a25d18f2d87a..f6b33cf23ae2 100644 --- a/include/asm-arm/arch-pnx4008/irqs.h +++ b/arch/arm/mach-pnx4008/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/irqs.h + * arch/arm/mach-pnx4008/include/mach/irqs.h * * PNX4008 IRQ controller driver - header file * diff --git a/include/asm-arm/arch-pnx4008/memory.h b/arch/arm/mach-pnx4008/include/mach/memory.h index 0d8268a95261..5789a2d16f5a 100644 --- a/include/asm-arm/arch-pnx4008/memory.h +++ b/arch/arm/mach-pnx4008/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/memory.h + * arch/arm/mach-pnx4008/include/mach/memory.h * * Copyright (c) 2005 Philips Semiconductors * Copyright (c) 2005 MontaVista Software, Inc. diff --git a/include/asm-arm/arch-pnx4008/param.h b/arch/arm/mach-pnx4008/include/mach/param.h index 95d5f547b416..6ea02f2176b7 100644 --- a/include/asm-arm/arch-pnx4008/param.h +++ b/arch/arm/mach-pnx4008/include/mach/param.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/param.h + * arch/arm/mach-pnx4008/include/mach/param.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-pnx4008/platform.h b/arch/arm/mach-pnx4008/include/mach/platform.h index 2613c7c669b1..368c2c10a308 100644 --- a/include/asm-arm/arch-pnx4008/platform.h +++ b/arch/arm/mach-pnx4008/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/platform.h + * arch/arm/mach-pnx4008/include/mach/platform.h * * PNX4008 Base addresses - header file * diff --git a/include/asm-arm/arch-pnx4008/pm.h b/arch/arm/mach-pnx4008/include/mach/pm.h index bac1634cb3e0..2fa685bff858 100644 --- a/include/asm-arm/arch-pnx4008/pm.h +++ b/arch/arm/mach-pnx4008/include/mach/pm.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/pm.h + * arch/arm/mach-pnx4008/include/mach/pm.h * * PNX4008 Power Management Routiness - header file * diff --git a/include/asm-arm/arch-pnx4008/system.h b/arch/arm/mach-pnx4008/include/mach/system.h index 17f9d7f9e5a1..8985a4622b8c 100644 --- a/include/asm-arm/arch-pnx4008/system.h +++ b/arch/arm/mach-pnx4008/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/system.h + * arch/arm/mach-pnx4008/include/mach/system.h * * Copyright (C) 2003 Philips Semiconductors * Copyright (C) 2005 MontaVista Software, Inc. @@ -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 void arch_idle(void) { diff --git a/include/asm-arm/arch-pnx4008/timex.h b/arch/arm/mach-pnx4008/include/mach/timex.h index f22ee24a0219..956fbd8e977c 100644 --- a/include/asm-arm/arch-pnx4008/timex.h +++ b/arch/arm/mach-pnx4008/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/timex.h + * arch/arm/mach-pnx4008/include/mach/timex.h * * PNX4008 timers header file * @@ -14,7 +14,7 @@ #ifndef __PNX4008_TIMEX_H #define __PNX4008_TIMEX_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #define CLOCK_TICK_RATE 1000000 diff --git a/include/asm-arm/arch-pnx4008/uncompress.h b/arch/arm/mach-pnx4008/include/mach/uncompress.h index 8fa4d24b72b4..bb4751ee2539 100644 --- a/include/asm-arm/arch-pnx4008/uncompress.h +++ b/arch/arm/mach-pnx4008/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pnx4008/uncompress.h + * arch/arm/mach-pnx4008/include/mach/uncompress.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2006 MontaVista Software, Inc. diff --git a/include/asm-arm/arch-pnx4008/vmalloc.h b/arch/arm/mach-pnx4008/include/mach/vmalloc.h index 140d925f6f37..2ad398378aed 100644 --- a/include/asm-arm/arch-pnx4008/vmalloc.h +++ b/arch/arm/mach-pnx4008/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/vmalloc.h + * arch/arm/mach-pnx4008/include/mach/vmalloc.h * * Author: Vitaly Wool <source@mvista.com> * |