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 /include/asm-arm/arch-pxa | |
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-pxa/include/mach/akita.h (renamed from include/asm-arm/arch-pxa/akita.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/audio.h (renamed from include/asm-arm/arch-pxa/audio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/bitfield.h (renamed from include/asm-arm/arch-pxa/bitfield.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/camera.h (renamed from include/asm-arm/arch-pxa/camera.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h (renamed from include/asm-arm/arch-pxa/colibri.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/corgi.h (renamed from include/asm-arm/arch-pxa/corgi.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/debug-macro.S (renamed from include/asm-arm/arch-pxa/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/dma.h (renamed from include/asm-arm/arch-pxa/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/entry-macro.S (renamed from include/asm-arm/arch-pxa/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/eseries-gpio.h (renamed from include/asm-arm/arch-pxa/eseries-gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/eseries-irq.h (renamed from include/asm-arm/arch-pxa/eseries-irq.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gpio.h (renamed from include/asm-arm/arch-pxa/gpio.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/gumstix.h (renamed from include/asm-arm/arch-pxa/gumstix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h (renamed from include/asm-arm/arch-pxa/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/i2c.h (renamed from include/asm-arm/arch-pxa/i2c.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/idp.h (renamed from include/asm-arm/arch-pxa/idp.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/io.h (renamed from include/asm-arm/arch-pxa/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/irda.h (renamed from include/asm-arm/arch-pxa/irda.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/irqs.h (renamed from include/asm-arm/arch-pxa/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/littleton.h (renamed from include/asm-arm/arch-pxa/littleton.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/lpd270.h (renamed from include/asm-arm/arch-pxa/lpd270.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/lubbock.h (renamed from include/asm-arm/arch-pxa/lubbock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/magician.h (renamed from include/asm-arm/arch-pxa/magician.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mainstone.h (renamed from include/asm-arm/arch-pxa/mainstone.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h (renamed from include/asm-arm/arch-pxa/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa25x.h (renamed from include/asm-arm/arch-pxa/mfp-pxa25x.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa27x.h (renamed from include/asm-arm/arch-pxa/mfp-pxa27x.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h (renamed from include/asm-arm/arch-pxa/mfp-pxa2xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa300.h (renamed from include/asm-arm/arch-pxa/mfp-pxa300.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa320.h (renamed from include/asm-arm/arch-pxa/mfp-pxa320.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h (renamed from include/asm-arm/arch-pxa/mfp-pxa3xx.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa930.h (renamed from include/asm-arm/arch-pxa/mfp-pxa930.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp.h (renamed from include/asm-arm/arch-pxa/mfp.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mmc.h (renamed from include/asm-arm/arch-pxa/mmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mtd-xip.h (renamed from include/asm-arm/arch-pxa/mtd-xip.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/ohci.h (renamed from include/asm-arm/arch-pxa/ohci.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h (renamed from include/asm-arm/arch-pxa/palmtx.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pcm027.h (renamed from include/asm-arm/arch-pxa/pcm027.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pcm990_baseboard.h (renamed from include/asm-arm/arch-pxa/pcm990_baseboard.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pm.h (renamed from include/asm-arm/arch-pxa/pm.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/poodle.h (renamed from include/asm-arm/arch-pxa/poodle.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa-regs.h (renamed from include/asm-arm/arch-pxa/pxa-regs.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa25x-udc.h (renamed from include/asm-arm/arch-pxa/pxa25x-udc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x-udc.h (renamed from include/asm-arm/arch-pxa/pxa27x-udc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x_keypad.h (renamed from include/asm-arm/arch-pxa/pxa27x_keypad.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h (renamed from include/asm-arm/arch-pxa/pxa2xx-gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa2xx-regs.h (renamed from include/asm-arm/arch-pxa/pxa2xx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa2xx_spi.h (renamed from include/asm-arm/arch-pxa/pxa2xx_spi.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa3xx-regs.h (renamed from include/asm-arm/arch-pxa/pxa3xx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa3xx_nand.h (renamed from include/asm-arm/arch-pxa/pxa3xx_nand.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxafb.h (renamed from include/asm-arm/arch-pxa/pxafb.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-lcd.h (renamed from include/asm-arm/arch-pxa/regs-lcd.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-ssp.h (renamed from include/asm-arm/arch-pxa/regs-ssp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/sharpsl.h (renamed from include/asm-arm/arch-pxa/sharpsl.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/spitz.h (renamed from include/asm-arm/arch-pxa/spitz.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/ssp.h (renamed from include/asm-arm/arch-pxa/ssp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/system.h (renamed from include/asm-arm/arch-pxa/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/timex.h (renamed from include/asm-arm/arch-pxa/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/tosa.h (renamed from include/asm-arm/arch-pxa/tosa.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/tosa_bt.h (renamed from include/asm-arm/arch-pxa/tosa_bt.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/trizeps4.h (renamed from include/asm-arm/arch-pxa/trizeps4.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/udc.h (renamed from include/asm-arm/arch-pxa/udc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h (renamed from include/asm-arm/arch-pxa/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/vmalloc.h (renamed from include/asm-arm/arch-pxa/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/zylonite.h (renamed from include/asm-arm/arch-pxa/zylonite.h) | 0 |
65 files changed, 54 insertions, 54 deletions
diff --git a/include/asm-arm/arch-pxa/akita.h b/arch/arm/mach-pxa/include/mach/akita.h index 5d8cc1d9cb10..5d8cc1d9cb10 100644 --- a/include/asm-arm/arch-pxa/akita.h +++ b/arch/arm/mach-pxa/include/mach/akita.h diff --git a/include/asm-arm/arch-pxa/audio.h b/arch/arm/mach-pxa/include/mach/audio.h index f82f96dd1053..f82f96dd1053 100644 --- a/include/asm-arm/arch-pxa/audio.h +++ b/arch/arm/mach-pxa/include/mach/audio.h diff --git a/include/asm-arm/arch-pxa/bitfield.h b/arch/arm/mach-pxa/include/mach/bitfield.h index f1f0e3387d9c..f1f0e3387d9c 100644 --- a/include/asm-arm/arch-pxa/bitfield.h +++ b/arch/arm/mach-pxa/include/mach/bitfield.h diff --git a/include/asm-arm/arch-pxa/camera.h b/arch/arm/mach-pxa/include/mach/camera.h index 39516ced8b1f..39516ced8b1f 100644 --- a/include/asm-arm/arch-pxa/camera.h +++ b/arch/arm/mach-pxa/include/mach/camera.h diff --git a/include/asm-arm/arch-pxa/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 2ae373fb5675..2ae373fb5675 100644 --- a/include/asm-arm/arch-pxa/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h diff --git a/include/asm-arm/arch-pxa/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h index bf856503baf6..bf856503baf6 100644 --- a/include/asm-arm/arch-pxa/corgi.h +++ b/arch/arm/mach-pxa/include/mach/corgi.h diff --git a/include/asm-arm/arch-pxa/debug-macro.S b/arch/arm/mach-pxa/include/mach/debug-macro.S index 9012cbc0ad8b..55d6a175ab19 100644 --- a/include/asm-arm/arch-pxa/debug-macro.S +++ b/arch/arm/mach-pxa/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-pxa/debug-macro.S +/* arch/arm/mach-pxa/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-pxa/dma.h b/arch/arm/mach-pxa/include/mach/dma.h index dbe110ee2666..955bfe606067 100644 --- a/include/asm-arm/arch-pxa/dma.h +++ b/arch/arm/mach-pxa/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/dma.h + * arch/arm/mach-pxa/include/mach/dma.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S index 897d164da223..de16c12d5232 100644 --- a/include/asm-arm/arch-pxa/entry-macro.S +++ b/arch/arm/mach-pxa/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pxa/entry-macro.S + * arch/arm/mach-pxa/include/mach/entry-macro.S * * Low-level IRQ helper macros for PXA-based platforms * @@ -7,8 +7,8 @@ * 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 <asm/arch/irqs.h> +#include <mach/hardware.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-pxa/eseries-gpio.h b/arch/arm/mach-pxa/include/mach/eseries-gpio.h index 4c90b1310270..4c90b1310270 100644 --- a/include/asm-arm/arch-pxa/eseries-gpio.h +++ b/arch/arm/mach-pxa/include/mach/eseries-gpio.h diff --git a/include/asm-arm/arch-pxa/eseries-irq.h b/arch/arm/mach-pxa/include/mach/eseries-irq.h index f2a93d5e31d3..f2a93d5e31d3 100644 --- a/include/asm-arm/arch-pxa/eseries-irq.h +++ b/arch/arm/mach-pxa/include/mach/eseries-irq.h diff --git a/include/asm-arm/arch-pxa/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 2c1e3d8ad7a2..2c538d8c362d 100644 --- a/include/asm-arm/arch-pxa/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/gpio.h + * arch/arm/mach-pxa/include/mach/gpio.h * * PXA GPIO wrappers for arch-neutral GPIO calls * @@ -24,9 +24,9 @@ #ifndef __ASM_ARCH_PXA_GPIO_H #define __ASM_ARCH_PXA_GPIO_H -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> #include <asm/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm-generic/gpio.h> diff --git a/include/asm-arm/arch-pxa/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h index 6fa85c4f94f8..42ee1956750e 100644 --- a/include/asm-arm/arch-pxa/gumstix.h +++ b/arch/arm/mach-pxa/include/mach/gumstix.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/gumstix.h + * arch/arm/mach-pxa/include/mach/gumstix.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-pxa/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 979a45695d7d..f8fb1e75997f 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/hardware.h + * arch/arm/mach-pxa/include/mach/hardware.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/i2c.h b/arch/arm/mach-pxa/include/mach/i2c.h index 80596b013443..80596b013443 100644 --- a/include/asm-arm/arch-pxa/i2c.h +++ b/arch/arm/mach-pxa/include/mach/i2c.h diff --git a/include/asm-arm/arch-pxa/idp.h b/arch/arm/mach-pxa/include/mach/idp.h index 21aa8ac35c1c..5eff96fcc944 100644 --- a/include/asm-arm/arch-pxa/idp.h +++ b/arch/arm/mach-pxa/include/mach/idp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/idp.h + * arch/arm/mach-pxa/include/mach/idp.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-pxa/io.h b/arch/arm/mach-pxa/include/mach/io.h index af34e0f2f7dc..600fd4f76603 100644 --- a/include/asm-arm/arch-pxa/io.h +++ b/arch/arm/mach-pxa/include/mach/io.h @@ -1,12 +1,12 @@ /* - * linux/include/asm-arm/arch-pxa/io.h + * arch/arm/mach-pxa/include/mach/io.h * * Copied from asm/arch/sa1100/io.h */ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-pxa/irda.h b/arch/arm/mach-pxa/include/mach/irda.h index 0a50c3c763df..0a50c3c763df 100644 --- a/include/asm-arm/arch-pxa/irda.h +++ b/arch/arm/mach-pxa/include/mach/irda.h diff --git a/include/asm-arm/arch-pxa/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 9413121b0ed9..32772bc6925c 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/irqs.h + * arch/arm/mach-pxa/include/mach/irqs.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h index 79d209b826f4..79d209b826f4 100644 --- a/include/asm-arm/arch-pxa/littleton.h +++ b/arch/arm/mach-pxa/include/mach/littleton.h diff --git a/include/asm-arm/arch-pxa/lpd270.h b/arch/arm/mach-pxa/include/mach/lpd270.h index 501d240ac120..f89fb715266b 100644 --- a/include/asm-arm/arch-pxa/lpd270.h +++ b/arch/arm/mach-pxa/include/mach/lpd270.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pxa/lpd270.h + * arch/arm/mach-pxa/include/mach/lpd270.h * * Author: Lennert Buytenhek * Created: Feb 10, 2006 diff --git a/include/asm-arm/arch-pxa/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h index 11ee73593fc3..4cb24154a5a8 100644 --- a/include/asm-arm/arch-pxa/lubbock.h +++ b/arch/arm/mach-pxa/include/mach/lubbock.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/lubbock.h + * arch/arm/mach-pxa/include/mach/lubbock.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/magician.h b/arch/arm/mach-pxa/include/mach/magician.h index 169b374f9921..38d68d99f585 100644 --- a/include/asm-arm/arch-pxa/magician.h +++ b/arch/arm/mach-pxa/include/mach/magician.h @@ -12,7 +12,7 @@ #ifndef _MAGICIAN_H_ #define _MAGICIAN_H_ -#include <asm/arch/irqs.h> +#include <mach/irqs.h> /* * PXA GPIOs diff --git a/include/asm-arm/arch-pxa/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h index 14c862adcaa1..3461c4302ff4 100644 --- a/include/asm-arm/arch-pxa/mainstone.h +++ b/arch/arm/mach-pxa/include/mach/mainstone.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/mainstone.h + * arch/arm/mach-pxa/include/mach/mainstone.h * * Author: Nicolas Pitre * Created: Nov 14, 2002 diff --git a/include/asm-arm/arch-pxa/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index bee81d66c184..552eb7fa6579 100644 --- a/include/asm-arm/arch-pxa/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/memory.h + * arch/arm/mach-pxa/include/mach/memory.h * * Author: Nicolas Pitre * Copyright: (C) 2001 MontaVista Software Inc. diff --git a/include/asm-arm/arch-pxa/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h index 0499323010ba..6c8e72238bfd 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa25x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h @@ -1,8 +1,8 @@ #ifndef __ASM_ARCH_MFP_PXA25X_H #define __ASM_ARCH_MFP_PXA25X_H -#include <asm/arch/mfp.h> -#include <asm/arch/mfp-pxa2xx.h> +#include <mach/mfp.h> +#include <mach/mfp-pxa2xx.h> /* GPIO */ #define GPIO2_GPIO MFP_CFG_IN(GPIO2, AF0) diff --git a/include/asm-arm/arch-pxa/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h index bc73ab84167c..122bdbd53182 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h @@ -8,8 +8,8 @@ * specific controller, and this should work in most cases. */ -#include <asm/arch/mfp.h> -#include <asm/arch/mfp-pxa2xx.h> +#include <mach/mfp.h> +#include <mach/mfp-pxa2xx.h> /* GPIO */ #define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) diff --git a/include/asm-arm/arch-pxa/mfp-pxa2xx.h b/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h index 8de1c0dae624..3e9211591e20 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa2xx.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARCH_MFP_PXA2XX_H #define __ASM_ARCH_MFP_PXA2XX_H -#include <asm/arch/mfp.h> +#include <mach/mfp.h> /* * the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx: diff --git a/include/asm-arm/arch-pxa/mfp-pxa300.h b/arch/arm/mach-pxa/include/mach/mfp-pxa300.h index bb410313556f..bc1fb33a6e70 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa300.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa300.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/mfp-pxa300.h + * arch/arm/mach-pxa/include/mach/mfp-pxa300.h * * PXA300/PXA310 specific MFP configuration definitions * @@ -15,8 +15,8 @@ #ifndef __ASM_ARCH_MFP_PXA300_H #define __ASM_ARCH_MFP_PXA300_H -#include <asm/arch/mfp.h> -#include <asm/arch/mfp-pxa3xx.h> +#include <mach/mfp.h> +#include <mach/mfp-pxa3xx.h> /* GPIO */ #define GPIO46_GPIO MFP_CFG(GPIO46, AF1) diff --git a/include/asm-arm/arch-pxa/mfp-pxa320.h b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h index 576aa46d90fc..74990510cf34 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa320.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/mfp-pxa320.h + * arch/arm/mach-pxa/include/mach/mfp-pxa320.h * * PXA320 specific MFP configuration definitions * @@ -15,8 +15,8 @@ #ifndef __ASM_ARCH_MFP_PXA320_H #define __ASM_ARCH_MFP_PXA320_H -#include <asm/arch/mfp.h> -#include <asm/arch/mfp-pxa3xx.h> +#include <mach/mfp.h> +#include <mach/mfp-pxa3xx.h> /* GPIO */ #define GPIO46_GPIO MFP_CFG(GPIO46, AF0) diff --git a/include/asm-arm/arch-pxa/mfp-pxa3xx.h b/arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h index 1f6b35c015d0..1f6b35c015d0 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa3xx.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h diff --git a/include/asm-arm/arch-pxa/mfp-pxa930.h b/arch/arm/mach-pxa/include/mach/mfp-pxa930.h index c4e945ab1923..fabd9b4df827 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa930.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa930.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/mfp-pxa930.h + * arch/arm/mach-pxa/include/mach/mfp-pxa930.h * * PXA930 specific MFP configuration definitions * @@ -13,8 +13,8 @@ #ifndef __ASM_ARCH_MFP_PXA9xx_H #define __ASM_ARCH_MFP_PXA9xx_H -#include <asm/arch/mfp.h> -#include <asm/arch/mfp-pxa3xx.h> +#include <mach/mfp.h> +#include <mach/mfp-pxa3xx.h> /* GPIO */ #define GPIO46_GPIO MFP_CFG(GPIO46, AF0) diff --git a/include/asm-arm/arch-pxa/mfp.h b/arch/arm/mach-pxa/include/mach/mfp.h index e7d58798da67..8769567b389b 100644 --- a/include/asm-arm/arch-pxa/mfp.h +++ b/arch/arm/mach-pxa/include/mach/mfp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/mfp.h + * arch/arm/mach-pxa/include/mach/mfp.h * * Multi-Function Pin Definitions * diff --git a/include/asm-arm/arch-pxa/mmc.h b/arch/arm/mach-pxa/include/mach/mmc.h index 6d1304c9270f..6d1304c9270f 100644 --- a/include/asm-arm/arch-pxa/mmc.h +++ b/arch/arm/mach-pxa/include/mach/mmc.h diff --git a/include/asm-arm/arch-pxa/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 8704dbceb432..351f32f13ce4 100644 --- a/include/asm-arm/arch-pxa/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h @@ -17,7 +17,7 @@ #ifndef __ARCH_PXA_MTD_XIP_H__ #define __ARCH_PXA_MTD_XIP_H__ -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> #define xip_irqpending() (ICIP & ICMR) diff --git a/include/asm-arm/arch-pxa/ohci.h b/arch/arm/mach-pxa/include/mach/ohci.h index e848a47128cd..e848a47128cd 100644 --- a/include/asm-arm/arch-pxa/ohci.h +++ b/arch/arm/mach-pxa/include/mach/ohci.h diff --git a/include/asm-arm/arch-pxa/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 1e8bccbda510..1e8bccbda510 100644 --- a/include/asm-arm/arch-pxa/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h diff --git a/include/asm-arm/arch-pxa/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h index 7beae1472c3e..4dcd2e8baa61 100644 --- a/include/asm-arm/arch-pxa/pcm027.h +++ b/arch/arm/mach-pxa/include/mach/pcm027.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/pcm027.h + * arch/arm/mach-pxa/include/mach/pcm027.h * * (c) 2003 Phytec Messtechnik GmbH <armlinux@phytec.de> * (c) 2007 Juergen Beisert <j.beisert@pengutronix.de> diff --git a/include/asm-arm/arch-pxa/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h index 2e2013179063..8a4383b776d7 100644 --- a/include/asm-arm/arch-pxa/pcm990_baseboard.h +++ b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pxa/pcm990_baseboard.h + * arch/arm/mach-pxa/include/mach/pcm990_baseboard.h * * (c) 2003 Phytec Messtechnik GmbH <armlinux@phytec.de> * (c) 2007 Juergen Beisert <j.beisert@pengutronix.de> @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/arch/pcm027.h> +#include <mach/pcm027.h> /* * definitions relevant only when the PCM-990 diff --git a/include/asm-arm/arch-pxa/pm.h b/arch/arm/mach-pxa/include/mach/pm.h index 261e5bc958db..261e5bc958db 100644 --- a/include/asm-arm/arch-pxa/pm.h +++ b/arch/arm/mach-pxa/include/mach/pm.h diff --git a/include/asm-arm/arch-pxa/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h index 4d6a40315764..8956afe8195e 100644 --- a/include/asm-arm/arch-pxa/poodle.h +++ b/arch/arm/mach-pxa/include/mach/poodle.h @@ -1,11 +1,11 @@ /* - * linux/include/asm-arm/arch-pxa/poodle.h + * arch/arm/mach-pxa/include/mach/poodle.h * * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. * * Based on: - * linux/include/asm-arm/arch-sa1100/collie.h + * arch/arm/mach-sa1100/include/mach/collie.h * * ChangeLog: * 04-06-2001 Lineo Japan, Inc. diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h index dce9308626b7..12288ca3cbb2 100644 --- a/include/asm-arm/arch-pxa/pxa-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/pxa-regs.h + * arch/arm/mach-pxa/include/mach/pxa-regs.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 @@ -829,7 +829,7 @@ */ /* - * SSP Serial Port Registers - see include/asm-arm/arch-pxa/regs-ssp.h + * SSP Serial Port Registers - see arch/arm/mach-pxa/include/mach/regs-ssp.h */ /* @@ -837,7 +837,7 @@ */ /* - * Core Clock - see include/asm-arm/arch-pxa/pxa2xx-regs.h + * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h */ #ifdef CONFIG_PXA27x diff --git a/include/asm-arm/arch-pxa/pxa25x-udc.h b/arch/arm/mach-pxa/include/mach/pxa25x-udc.h index 1b80a4805a60..1b80a4805a60 100644 --- a/include/asm-arm/arch-pxa/pxa25x-udc.h +++ b/arch/arm/mach-pxa/include/mach/pxa25x-udc.h diff --git a/include/asm-arm/arch-pxa/pxa27x-udc.h b/arch/arm/mach-pxa/include/mach/pxa27x-udc.h index ab1443f8bd89..ab1443f8bd89 100644 --- a/include/asm-arm/arch-pxa/pxa27x-udc.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x-udc.h diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h index d5a48a96dea7..d5a48a96dea7 100644 --- a/include/asm-arm/arch-pxa/pxa27x_keypad.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h diff --git a/include/asm-arm/arch-pxa/pxa2xx-gpio.h b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h index 6ef1dd09970b..6ef1dd09970b 100644 --- a/include/asm-arm/arch-pxa/pxa2xx-gpio.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h diff --git a/include/asm-arm/arch-pxa/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h index 73e0a329cf7f..806ecfea44bf 100644 --- a/include/asm-arm/arch-pxa/pxa2xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/pxa2xx-regs.h + * arch/arm/mach-pxa/include/mach/pxa2xx-regs.h * * Taken from pxa-regs.h by Russell King * diff --git a/include/asm-arm/arch-pxa/pxa2xx_spi.h b/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h index 2206cb61a9f9..2206cb61a9f9 100644 --- a/include/asm-arm/arch-pxa/pxa2xx_spi.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h diff --git a/include/asm-arm/arch-pxa/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h index fe9364c83a28..39eb68319e28 100644 --- a/include/asm-arm/arch-pxa/pxa3xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h + * arch/arm/mach-pxa/include/mach/pxa3xx-regs.h * * PXA3xx specific register definitions * diff --git a/include/asm-arm/arch-pxa/pxa3xx_nand.h b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h index eb4b190b6657..eb4b190b6657 100644 --- a/include/asm-arm/arch-pxa/pxa3xx_nand.h +++ b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h diff --git a/include/asm-arm/arch-pxa/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index daf018d0c604..65447549616f 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/pxafb.h + * arch/arm/mach-pxa/include/mach/pxafb.h * * Support for the xscale frame buffer. * @@ -13,7 +13,7 @@ */ #include <linux/fb.h> -#include <asm/arch/regs-lcd.h> +#include <mach/regs-lcd.h> /* * Supported LCD connections diff --git a/include/asm-arm/arch-pxa/regs-lcd.h b/arch/arm/mach-pxa/include/mach/regs-lcd.h index 820a189684a9..c689c4ea769c 100644 --- a/include/asm-arm/arch-pxa/regs-lcd.h +++ b/arch/arm/mach-pxa/include/mach/regs-lcd.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARCH_REGS_LCD_H #define __ASM_ARCH_REGS_LCD_H -#include <asm/arch/bitfield.h> +#include <mach/bitfield.h> /* * LCD Controller Registers and Bits Definitions diff --git a/include/asm-arm/arch-pxa/regs-ssp.h b/arch/arm/mach-pxa/include/mach/regs-ssp.h index 3c04cde2cf1f..3c04cde2cf1f 100644 --- a/include/asm-arm/arch-pxa/regs-ssp.h +++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h diff --git a/include/asm-arm/arch-pxa/sharpsl.h b/arch/arm/mach-pxa/include/mach/sharpsl.h index 3b1d4a72d4d1..3b1d4a72d4d1 100644 --- a/include/asm-arm/arch-pxa/sharpsl.h +++ b/arch/arm/mach-pxa/include/mach/sharpsl.h diff --git a/include/asm-arm/arch-pxa/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h index bd14365f7ed5..bd14365f7ed5 100644 --- a/include/asm-arm/arch-pxa/spitz.h +++ b/arch/arm/mach-pxa/include/mach/spitz.h diff --git a/include/asm-arm/arch-pxa/ssp.h b/arch/arm/mach-pxa/include/mach/ssp.h index a012882c9ee6..a012882c9ee6 100644 --- a/include/asm-arm/arch-pxa/ssp.h +++ b/arch/arm/mach-pxa/include/mach/ssp.h diff --git a/include/asm-arm/arch-pxa/system.h b/arch/arm/mach-pxa/include/mach/system.h index 6956fc5235f8..0f381e692999 100644 --- a/include/asm-arm/arch-pxa/system.h +++ b/arch/arm/mach-pxa/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/system.h + * arch/arm/mach-pxa/include/mach/system.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/timex.h b/arch/arm/mach-pxa/include/mach/timex.h index 8d882f0b6a16..b05fc6683c47 100644 --- a/include/asm-arm/arch-pxa/timex.h +++ b/arch/arm/mach-pxa/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/timex.h + * arch/arm/mach-pxa/include/mach/timex.h * * Author: Nicolas Pitre * Created: Jun 15, 2001 diff --git a/include/asm-arm/arch-pxa/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h index a72803f0461b..a72803f0461b 100644 --- a/include/asm-arm/arch-pxa/tosa.h +++ b/arch/arm/mach-pxa/include/mach/tosa.h diff --git a/include/asm-arm/arch-pxa/tosa_bt.h b/arch/arm/mach-pxa/include/mach/tosa_bt.h index efc3c3d3b75d..efc3c3d3b75d 100644 --- a/include/asm-arm/arch-pxa/tosa_bt.h +++ b/arch/arm/mach-pxa/include/mach/tosa_bt.h diff --git a/include/asm-arm/arch-pxa/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h index 641d0ec110bb..641d0ec110bb 100644 --- a/include/asm-arm/arch-pxa/trizeps4.h +++ b/arch/arm/mach-pxa/include/mach/trizeps4.h diff --git a/include/asm-arm/arch-pxa/udc.h b/arch/arm/mach-pxa/include/mach/udc.h index 27aa3a91012f..2f82332e81a0 100644 --- a/include/asm-arm/arch-pxa/udc.h +++ b/arch/arm/mach-pxa/include/mach/udc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/udc.h + * arch/arm/mach-pxa/include/mach/udc.h * */ #include <asm/mach/udc_pxa2xx.h> diff --git a/include/asm-arm/arch-pxa/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index f4551269aaf2..21e3e890af98 100644 --- a/include/asm-arm/arch-pxa/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/uncompress.h + * arch/arm/mach-pxa/include/mach/uncompress.h * * Author: Nicolas Pitre * Copyright: (C) 2001 MontaVista Software Inc. @@ -10,7 +10,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> #include <asm/mach-types.h> #define __REG(x) ((volatile unsigned long *)x) diff --git a/include/asm-arm/arch-pxa/vmalloc.h b/arch/arm/mach-pxa/include/mach/vmalloc.h index 5bb450c7aa2c..e90c5eeb81dd 100644 --- a/include/asm-arm/arch-pxa/vmalloc.h +++ b/arch/arm/mach-pxa/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-pxa/vmalloc.h + * arch/arm/mach-pxa/include/mach/vmalloc.h * * Author: Nicolas Pitre * Copyright: (C) 2001 MontaVista Software Inc. diff --git a/include/asm-arm/arch-pxa/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h index 0d35ca04731e..0d35ca04731e 100644 --- a/include/asm-arm/arch-pxa/zylonite.h +++ b/arch/arm/mach-pxa/include/mach/zylonite.h |