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 /arch/arm/plat-omap | |
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/plat-omap/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/common.c | 14 | ||||
-rw-r--r-- | arch/arm/plat-omap/cpu-omap.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/debug-devices.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/debug-leds.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/devices.c | 14 | ||||
-rw-r--r-- | arch/arm/plat-omap/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/fb.c | 8 | ||||
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/i2c.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/aic23.h (renamed from include/asm-arm/arch-omap/aic23.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/blizzard.h (renamed from include/asm-arm/arch-omap/blizzard.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-2430sdp.h (renamed from include/asm-arm/arch-omap/board-2430sdp.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-ams-delta.h (renamed from include/asm-arm/arch-omap/board-ams-delta.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-apollon.h (renamed from include/asm-arm/arch-omap/board-apollon.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-fsample.h (renamed from include/asm-arm/arch-omap/board-fsample.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-h2.h (renamed from include/asm-arm/arch-omap/board-h2.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-h3.h (renamed from include/asm-arm/arch-omap/board-h3.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-h4.h (renamed from include/asm-arm/arch-omap/board-h4.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-innovator.h (renamed from include/asm-arm/arch-omap/board-innovator.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-nokia.h (renamed from include/asm-arm/arch-omap/board-nokia.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-osk.h (renamed from include/asm-arm/arch-omap/board-osk.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-palmte.h (renamed from include/asm-arm/arch-omap/board-palmte.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-palmtt.h (renamed from include/asm-arm/arch-omap/board-palmtt.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-palmz71.h (renamed from include/asm-arm/arch-omap/board-palmz71.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-perseus2.h (renamed from include/asm-arm/arch-omap/board-perseus2.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-sx1.h (renamed from include/asm-arm/arch-omap/board-sx1.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-voiceblue.h (renamed from include/asm-arm/arch-omap/board-voiceblue.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board.h (renamed from include/asm-arm/arch-omap/board.h) | 8 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/clock.h (renamed from include/asm-arm/arch-omap/clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/common.h (renamed from include/asm-arm/arch-omap/common.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/control.h (renamed from include/asm-arm/arch-omap/control.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/cpu.h (renamed from include/asm-arm/arch-omap/cpu.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/debug-macro.S (renamed from include/asm-arm/arch-omap/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/dma.h (renamed from include/asm-arm/arch-omap/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/dmtimer.h (renamed from include/asm-arm/arch-omap/dmtimer.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/dsp_common.h (renamed from include/asm-arm/arch-omap/dsp_common.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/eac.h (renamed from include/asm-arm/arch-omap/eac.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/entry-macro.S (renamed from include/asm-arm/arch-omap/entry-macro.S) | 10 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/fpga.h (renamed from include/asm-arm/arch-omap/fpga.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/gpio-switch.h (renamed from include/asm-arm/arch-omap/gpio-switch.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/gpio.h (renamed from include/asm-arm/arch-omap/gpio.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/gpioexpander.h (renamed from include/asm-arm/arch-omap/gpioexpander.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/gpmc.h (renamed from include/asm-arm/arch-omap/gpmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/hardware.h (renamed from include/asm-arm/arch-omap/hardware.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/hwa742.h (renamed from include/asm-arm/arch-omap/hwa742.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/io.h (renamed from include/asm-arm/arch-omap/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/irda.h (renamed from include/asm-arm/arch-omap/irda.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/irqs.h (renamed from include/asm-arm/arch-omap/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/keypad.h (renamed from include/asm-arm/arch-omap/keypad.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/lcd_mipid.h (renamed from include/asm-arm/arch-omap/lcd_mipid.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/led.h (renamed from include/asm-arm/arch-omap/led.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mailbox.h (renamed from include/asm-arm/arch-omap/mailbox.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mcbsp.h (renamed from include/asm-arm/arch-omap/mcbsp.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mcspi.h (renamed from include/asm-arm/arch-omap/mcspi.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/memory.h (renamed from include/asm-arm/arch-omap/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/menelaus.h (renamed from include/asm-arm/arch-omap/menelaus.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mmc.h (renamed from include/asm-arm/arch-omap/mmc.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mtd-xip.h (renamed from include/asm-arm/arch-omap/mtd-xip.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mux.h (renamed from include/asm-arm/arch-omap/mux.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/nand.h (renamed from include/asm-arm/arch-omap/nand.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap-alsa.h (renamed from include/asm-arm/arch-omap/omap-alsa.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap1510.h (renamed from include/asm-arm/arch-omap/omap1510.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap16xx.h (renamed from include/asm-arm/arch-omap/omap16xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap24xx.h (renamed from include/asm-arm/arch-omap/omap24xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap34xx.h (renamed from include/asm-arm/arch-omap/omap34xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap730.h (renamed from include/asm-arm/arch-omap/omap730.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omapfb.h (renamed from include/asm-arm/arch-omap/omapfb.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/onenand.h (renamed from include/asm-arm/arch-omap/onenand.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/param.h (renamed from include/asm-arm/arch-omap/param.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/pm.h (renamed from include/asm-arm/arch-omap/pm.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/prcm.h (renamed from include/asm-arm/arch-omap/prcm.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/sdrc.h (renamed from include/asm-arm/arch-omap/sdrc.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/serial.h (renamed from include/asm-arm/arch-omap/serial.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/sram.h (renamed from include/asm-arm/arch-omap/sram.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/system.h (renamed from include/asm-arm/arch-omap/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/tc.h (renamed from include/asm-arm/arch-omap/tc.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/timex.h (renamed from include/asm-arm/arch-omap/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/uncompress.h (renamed from include/asm-arm/arch-omap/uncompress.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/usb.h (renamed from include/asm-arm/arch-omap/usb.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/vmalloc.h (renamed from include/asm-arm/arch-omap/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/mailbox.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/mux.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/ocpi.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/sram.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/usb.c | 10 |
88 files changed, 136 insertions, 136 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index c2e741de0203..23a070599993 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -26,7 +26,7 @@ #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> static LIST_HEAD(clocks); static DEFINE_MUTEX(clocks_mutex); diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 6a955296e8c1..f4dff423ae7c 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -19,20 +19,20 @@ #include <linux/serial_reg.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/system.h> #include <asm/pgtable.h> #include <asm/mach/map.h> #include <asm/io.h> #include <asm/setup.h> -#include <asm/arch/common.h> -#include <asm/arch/board.h> -#include <asm/arch/control.h> -#include <asm/arch/mux.h> -#include <asm/arch/fpga.h> +#include <mach/common.h> +#include <mach/board.h> +#include <mach/control.h> +#include <mach/mux.h> +#include <mach/fpga.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) # include "../mach-omap2/sdrc.h" diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c index 3c8ef1ac5f3d..ae1de308aaad 100644 --- a/arch/arm/plat-omap/cpu-omap.c +++ b/arch/arm/plat-omap/cpu-omap.c @@ -21,7 +21,7 @@ #include <linux/err.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c index 7228ef8534b7..5b73bb274452 100644 --- a/arch/arm/plat-omap/debug-devices.c +++ b/arch/arm/plat-omap/debug-devices.c @@ -13,11 +13,11 @@ #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/board.h> -#include <asm/arch/gpio.h> +#include <mach/board.h> +#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c index a47695c3171a..9422dee7de84 100644 --- a/arch/arm/plat-omap/debug-leds.c +++ b/arch/arm/plat-omap/debug-leds.c @@ -13,13 +13,13 @@ #include <linux/leds.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/leds.h> #include <asm/system.h> #include <asm/mach-types.h> -#include <asm/arch/fpga.h> -#include <asm/arch/gpio.h> +#include <mach/fpga.h> +#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 9b4240b9d65f..187e3d8bfdfe 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -14,17 +14,17 @@ #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/mach/map.h> -#include <asm/arch/tc.h> -#include <asm/arch/board.h> -#include <asm/arch/mux.h> -#include <asm/arch/gpio.h> -#include <asm/arch/menelaus.h> -#include <asm/arch/mcbsp.h> +#include <mach/tc.h> +#include <mach/board.h> +#include <mach/mux.h> +#include <mach/gpio.h> +#include <mach/menelaus.h> +#include <mach/mcbsp.h> #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 69450d61cf4f..a63b644ad305 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -28,10 +28,10 @@ #include <linux/io.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/dma.h> -#include <asm/arch/tc.h> +#include <mach/tc.h> #undef DEBUG diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 30b6f2c9cb33..743a4abcd85d 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -32,10 +32,10 @@ #include <linux/list.h> #include <linux/clk.h> #include <linux/delay.h> -#include <asm/arch/hardware.h> -#include <asm/arch/dmtimer.h> +#include <mach/hardware.h> +#include <mach/dmtimer.h> #include <asm/io.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> /* register offsets */ #define _OMAP_TIMER_ID_OFFSET 0x00 diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index b0b3c5419b0a..17a92a31e746 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -28,13 +28,13 @@ #include <linux/platform_device.h> #include <linux/bootmem.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach/map.h> -#include <asm/arch/board.h> -#include <asm/arch/sram.h> -#include <asm/arch/omapfb.h> +#include <mach/board.h> +#include <mach/sram.h> +#include <mach/omapfb.h> #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 7112b5db4a36..3e76ee2bc731 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -18,10 +18,10 @@ #include <linux/err.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> -#include <asm/arch/irqs.h> -#include <asm/arch/gpio.h> +#include <mach/irqs.h> +#include <mach/gpio.h> #include <asm/mach/irq.h> #include <asm/io.h> diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 647ed5971c60..0e6d147ab6f8 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -26,7 +26,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/i2c.h> -#include <asm/arch/mux.h> +#include <mach/mux.h> #define OMAP_I2C_SIZE 0x3f #define OMAP1_I2C_BASE 0xfffb3800 diff --git a/include/asm-arm/arch-omap/aic23.h b/arch/arm/plat-omap/include/mach/aic23.h index aec2d6563622..5ccedac77526 100644 --- a/include/asm-arm/arch-omap/aic23.h +++ b/arch/arm/plat-omap/include/mach/aic23.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/aic23.h + * arch/arm/plat-omap/include/mach/aic23.h * * Hardware definitions for TI TLV320AIC23 audio codec * diff --git a/include/asm-arm/arch-omap/blizzard.h b/arch/arm/plat-omap/include/mach/blizzard.h index 8d160f171372..8d160f171372 100644 --- a/include/asm-arm/arch-omap/blizzard.h +++ b/arch/arm/plat-omap/include/mach/blizzard.h diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/arch/arm/plat-omap/include/mach/board-2430sdp.h index c7db9004ec31..cf1dc0223949 100644 --- a/include/asm-arm/arch-omap/board-2430sdp.h +++ b/arch/arm/plat-omap/include/mach/board-2430sdp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-2430sdp.h + * arch/arm/plat-omap/include/mach/board-2430sdp.h * * Hardware definitions for TI OMAP2430 SDP board. * diff --git a/include/asm-arm/arch-omap/board-ams-delta.h b/arch/arm/plat-omap/include/mach/board-ams-delta.h index 9aee15d97145..51b102dc906b 100644 --- a/include/asm-arm/arch-omap/board-ams-delta.h +++ b/arch/arm/plat-omap/include/mach/board-ams-delta.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-ams-delta.h + * arch/arm/plat-omap/include/mach/board-ams-delta.h * * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> * diff --git a/include/asm-arm/arch-omap/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h index 547125a4695e..d6f2a8e963d5 100644 --- a/include/asm-arm/arch-omap/board-apollon.h +++ b/arch/arm/plat-omap/include/mach/board-apollon.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-apollon.h + * arch/arm/plat-omap/include/mach/board-apollon.h * * Hardware definitions for Samsung OMAP24XX Apollon board. * diff --git a/include/asm-arm/arch-omap/board-fsample.h b/arch/arm/plat-omap/include/mach/board-fsample.h index 89a1e529fb6f..cb3c5ae12776 100644 --- a/include/asm-arm/arch-omap/board-fsample.h +++ b/arch/arm/plat-omap/include/mach/board-fsample.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-fsample.h + * arch/arm/plat-omap/include/mach/board-fsample.h * * Board-specific goodies for TI F-Sample. * @@ -15,7 +15,7 @@ #define __ASM_ARCH_OMAP_FSAMPLE_H /* fsample is pretty close to p2-sample */ -#include <asm/arch/board-perseus2.h> +#include <mach/board-perseus2.h> #define fsample_cpld_read(reg) __raw_readb(reg) #define fsample_cpld_write(val, reg) __raw_writeb(val, reg) diff --git a/include/asm-arm/arch-omap/board-h2.h b/arch/arm/plat-omap/include/mach/board-h2.h index c322796d0d26..2a050e9be65f 100644 --- a/include/asm-arm/arch-omap/board-h2.h +++ b/arch/arm/plat-omap/include/mach/board-h2.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-h2.h + * arch/arm/plat-omap/include/mach/board-h2.h * * Hardware definitions for TI OMAP1610 H2 board. * diff --git a/include/asm-arm/arch-omap/board-h3.h b/arch/arm/plat-omap/include/mach/board-h3.h index c5d0f32a40ac..14909dc7858a 100644 --- a/include/asm-arm/arch-omap/board-h3.h +++ b/arch/arm/plat-omap/include/mach/board-h3.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-h3.h + * arch/arm/plat-omap/include/mach/board-h3.h * * Copyright (C) 2001 RidgeRun, Inc. * Copyright (C) 2004 Texas Instruments, Inc. diff --git a/include/asm-arm/arch-omap/board-h4.h b/arch/arm/plat-omap/include/mach/board-h4.h index 7e0efef4bb65..1470cd3e519b 100644 --- a/include/asm-arm/arch-omap/board-h4.h +++ b/arch/arm/plat-omap/include/mach/board-h4.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-h4.h + * arch/arm/plat-omap/include/mach/board-h4.h * * Hardware definitions for TI OMAP1610 H4 board. * diff --git a/include/asm-arm/arch-omap/board-innovator.h b/arch/arm/plat-omap/include/mach/board-innovator.h index 9ca03dec9d36..5ae3e79b9f9c 100644 --- a/include/asm-arm/arch-omap/board-innovator.h +++ b/arch/arm/plat-omap/include/mach/board-innovator.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-innovator.h + * arch/arm/plat-omap/include/mach/board-innovator.h * * Copyright (C) 2001 RidgeRun, Inc. * diff --git a/include/asm-arm/arch-omap/board-nokia.h b/arch/arm/plat-omap/include/mach/board-nokia.h index 72deea203493..2abbe001af8c 100644 --- a/include/asm-arm/arch-omap/board-nokia.h +++ b/arch/arm/plat-omap/include/mach/board-nokia.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-nokia.h + * arch/arm/plat-omap/include/mach/board-nokia.h * * Information structures for Nokia-specific board config data * diff --git a/include/asm-arm/arch-omap/board-osk.h b/arch/arm/plat-omap/include/mach/board-osk.h index 94926090e475..3850cb1f220a 100644 --- a/include/asm-arm/arch-omap/board-osk.h +++ b/arch/arm/plat-omap/include/mach/board-osk.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-osk.h + * arch/arm/plat-omap/include/mach/board-osk.h * * Hardware definitions for TI OMAP5912 OSK board. * diff --git a/include/asm-arm/arch-omap/board-palmte.h b/arch/arm/plat-omap/include/mach/board-palmte.h index 6fac2c8935be..6906cdebbcfb 100644 --- a/include/asm-arm/arch-omap/board-palmte.h +++ b/arch/arm/plat-omap/include/mach/board-palmte.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-palmte.h + * arch/arm/plat-omap/include/mach/board-palmte.h * * Hardware definitions for the Palm Tungsten E device. * diff --git a/include/asm-arm/arch-omap/board-palmtt.h b/arch/arm/plat-omap/include/mach/board-palmtt.h index d9590b0ec90e..e79f382b5931 100644 --- a/include/asm-arm/arch-omap/board-palmtt.h +++ b/arch/arm/plat-omap/include/mach/board-palmtt.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-palmte.h + * arch/arm/plat-omap/include/mach/board-palmte.h * * Hardware definitions for the Palm Tungsten|T device. * diff --git a/include/asm-arm/arch-omap/board-palmz71.h b/arch/arm/plat-omap/include/mach/board-palmz71.h index 1252a859787d..b1d7d579b313 100644 --- a/include/asm-arm/arch-omap/board-palmz71.h +++ b/arch/arm/plat-omap/include/mach/board-palmz71.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-palmz71.h + * arch/arm/plat-omap/include/mach/board-palmz71.h * * Hardware definitions for the Palm Zire71 device. * diff --git a/include/asm-arm/arch-omap/board-perseus2.h b/arch/arm/plat-omap/include/mach/board-perseus2.h index d7429cb0f726..c06c3d717d57 100644 --- a/include/asm-arm/arch-omap/board-perseus2.h +++ b/arch/arm/plat-omap/include/mach/board-perseus2.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board-perseus2.h + * arch/arm/plat-omap/include/mach/board-perseus2.h * * Copyright 2003 by Texas Instruments Incorporated * OMAP730 / Perseus2 support by Jean Pihet @@ -30,7 +30,7 @@ #ifndef __ASM_ARCH_OMAP_PERSEUS2_H #define __ASM_ARCH_OMAP_PERSEUS2_H -#include <asm/arch/fpga.h> +#include <mach/fpga.h> #ifndef OMAP_SDRAM_DEVICE #define OMAP_SDRAM_DEVICE D256M_1X16_4B diff --git a/include/asm-arm/arch-omap/board-sx1.h b/arch/arm/plat-omap/include/mach/board-sx1.h index 355adbdaae33..355adbdaae33 100644 --- a/include/asm-arm/arch-omap/board-sx1.h +++ b/arch/arm/plat-omap/include/mach/board-sx1.h diff --git a/include/asm-arm/arch-omap/board-voiceblue.h b/arch/arm/plat-omap/include/mach/board-voiceblue.h index ed6d346ee123..ed6d346ee123 100644 --- a/include/asm-arm/arch-omap/board-voiceblue.h +++ b/arch/arm/plat-omap/include/mach/board-voiceblue.h diff --git a/include/asm-arm/arch-omap/board.h b/arch/arm/plat-omap/include/mach/board.h index 99564c70f128..54445642f35d 100644 --- a/include/asm-arm/arch-omap/board.h +++ b/arch/arm/plat-omap/include/mach/board.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/board.h + * arch/arm/plat-omap/include/mach/board.h * * Information structures for board-specific data * @@ -12,7 +12,7 @@ #include <linux/types.h> -#include <asm/arch/gpio-switch.h> +#include <mach/gpio-switch.h> /* Different peripheral ids */ #define OMAP_TAG_CLOCK 0x4f01 @@ -125,7 +125,7 @@ struct omap_pwm_led_platform_data { void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off); }; -/* See include/asm-arm/arch-omap/gpio-switch.h for definitions */ +/* See arch/arm/plat-omap/include/mach/gpio-switch.h for definitions */ struct omap_gpio_switch_config { char name[12]; u16 gpio; @@ -154,7 +154,7 @@ struct omap_version_config { }; -#include <asm/arch/board-nokia.h> +#include <mach/board-nokia.h> struct omap_board_config_entry { u16 tag; diff --git a/include/asm-arm/arch-omap/clock.h b/arch/arm/plat-omap/include/mach/clock.h index 4c7b3514f71a..92f7c7238fcd 100644 --- a/include/asm-arm/arch-omap/clock.h +++ b/arch/arm/plat-omap/include/mach/clock.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/clock.h + * arch/arm/plat-omap/include/mach/clock.h * * Copyright (C) 2004 - 2005 Nokia corporation * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> diff --git a/include/asm-arm/arch-omap/common.h b/arch/arm/plat-omap/include/mach/common.h index 8ac03071f60c..06093112b665 100644 --- a/include/asm-arm/arch-omap/common.h +++ b/arch/arm/plat-omap/include/mach/common.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/common.h + * arch/arm/plat-omap/include/mach/common.h * * Header for code common to all OMAP machines. * diff --git a/include/asm-arm/arch-omap/control.h b/arch/arm/plat-omap/include/mach/control.h index 987553e3eeb9..e3fd62d9a995 100644 --- a/include/asm-arm/arch-omap/control.h +++ b/arch/arm/plat-omap/include/mach/control.h @@ -2,7 +2,7 @@ #define __ASM_ARCH_CONTROL_H /* - * include/asm-arm/arch-omap/control.h + * arch/arm/plat-omap/include/mach/control.h * * OMAP2/3 System Control Module definitions * @@ -16,7 +16,7 @@ * the Free Software Foundation. */ -#include <asm/arch/io.h> +#include <mach/io.h> #define OMAP242X_CTRL_REGADDR(reg) \ (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) diff --git a/include/asm-arm/arch-omap/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index 52db09f83281..05aee0eda34f 100644 --- a/include/asm-arm/arch-omap/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/cpu.h + * arch/arm/plat-omap/include/mach/cpu.h * * OMAP cpu type detection * diff --git a/include/asm-arm/arch-omap/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S index ca4f577f9675..1b0039bdeb4e 100644 --- a/include/asm-arm/arch-omap/debug-macro.S +++ b/arch/arm/plat-omap/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-omap/debug-macro.S +/* arch/arm/plat-omap/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-omap/dma.h b/arch/arm/plat-omap/include/mach/dma.h index f4dcb9587869..54fe9665b182 100644 --- a/include/asm-arm/arch-omap/dma.h +++ b/arch/arm/plat-omap/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/dma.h + * arch/arm/plat-omap/include/mach/dma.h * * Copyright (C) 2003 Nokia Corporation * Author: Juha Yrjölä <juha.yrjola@nokia.com> diff --git a/include/asm-arm/arch-omap/dmtimer.h b/arch/arm/plat-omap/include/mach/dmtimer.h index 02b29e8437ae..6dc703138210 100644 --- a/include/asm-arm/arch-omap/dmtimer.h +++ b/arch/arm/plat-omap/include/mach/dmtimer.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/dmtimer.h + * arch/arm/plat-omap/include/mach/dmtimer.h * * OMAP Dual-Mode Timers * diff --git a/include/asm-arm/arch-omap/dsp_common.h b/arch/arm/plat-omap/include/mach/dsp_common.h index da97736f3efa..da97736f3efa 100644 --- a/include/asm-arm/arch-omap/dsp_common.h +++ b/arch/arm/plat-omap/include/mach/dsp_common.h diff --git a/include/asm-arm/arch-omap/eac.h b/arch/arm/plat-omap/include/mach/eac.h index ccee3b0700b3..9e62cf030270 100644 --- a/include/asm-arm/arch-omap/eac.h +++ b/arch/arm/plat-omap/include/mach/eac.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap2/eac.h + * arch/arm/plat-omap/include/mach2/eac.h * * Defines for Enhanced Audio Controller * @@ -27,8 +27,8 @@ #ifndef __ASM_ARM_ARCH_OMAP2_EAC_H #define __ASM_ARM_ARCH_OMAP2_EAC_H -#include <asm/arch/io.h> -#include <asm/arch/hardware.h> +#include <mach/io.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <sound/core.h> diff --git a/include/asm-arm/arch-omap/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S index 67ed7839e782..d4e9043bf201 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/arch/arm/plat-omap/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-omap/entry-macro.S + * arch/arm/plat-omap/include/mach/entry-macro.S * * Low-level IRQ helper macros for OMAP-based platforms * @@ -7,9 +7,9 @@ * 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/io.h> -#include <asm/arch/irqs.h> +#include <mach/hardware.h> +#include <mach/io.h> +#include <mach/irqs.h> #if defined(CONFIG_ARCH_OMAP1) @@ -57,7 +57,7 @@ #elif defined(CONFIG_ARCH_OMAP24XX) -#include <asm/arch/omap24xx.h> +#include <mach/omap24xx.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-omap/fpga.h b/arch/arm/plat-omap/include/mach/fpga.h index f420881d2a3b..c92e4b42b289 100644 --- a/include/asm-arm/arch-omap/fpga.h +++ b/arch/arm/plat-omap/include/mach/fpga.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/fpga.h + * arch/arm/plat-omap/include/mach/fpga.h * * Interrupt handler for OMAP-1510 FPGA * diff --git a/include/asm-arm/arch-omap/gpio-switch.h b/arch/arm/plat-omap/include/mach/gpio-switch.h index 10da0e07c0cf..10da0e07c0cf 100644 --- a/include/asm-arm/arch-omap/gpio-switch.h +++ b/arch/arm/plat-omap/include/mach/gpio-switch.h diff --git a/include/asm-arm/arch-omap/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h index 5ee6a49864c3..94ce2780e8ee 100644 --- a/include/asm-arm/arch-omap/gpio.h +++ b/arch/arm/plat-omap/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/gpio.h + * arch/arm/plat-omap/include/mach/gpio.h * * OMAP GPIO handling defines and functions * @@ -26,7 +26,7 @@ #ifndef __ASM_ARCH_OMAP_GPIO_H #define __ASM_ARCH_OMAP_GPIO_H -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include <asm/io.h> #define OMAP_MPUIO_BASE (void __iomem *)0xfffb5000 diff --git a/include/asm-arm/arch-omap/gpioexpander.h b/arch/arm/plat-omap/include/mach/gpioexpander.h index 4eed1f80e2fb..90444a0d6b1a 100644 --- a/include/asm-arm/arch-omap/gpioexpander.h +++ b/arch/arm/plat-omap/include/mach/gpioexpander.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/gpioexpander.h + * arch/arm/plat-omap/include/mach/gpioexpander.h * * * Copyright (C) 2004 Texas Instruments, Inc. diff --git a/include/asm-arm/arch-omap/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h index 6a8e07ffc2d0..6a8e07ffc2d0 100644 --- a/include/asm-arm/arch-omap/gpmc.h +++ b/arch/arm/plat-omap/include/mach/gpmc.h diff --git a/include/asm-arm/arch-omap/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 45fdfccbd5d4..07f5d7f21528 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/hardware.h + * arch/arm/plat-omap/include/mach/hardware.h * * Hardware definitions for TI OMAP processors and boards * @@ -39,9 +39,9 @@ #include <asm/sizes.h> #ifndef __ASSEMBLER__ #include <asm/types.h> -#include <asm/arch/cpu.h> +#include <mach/cpu.h> #endif -#include <asm/arch/serial.h> +#include <mach/serial.h> /* * --------------------------------------------------------------------------- diff --git a/include/asm-arm/arch-omap/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h index 577f492f2d3c..577f492f2d3c 100644 --- a/include/asm-arm/arch-omap/hwa742.h +++ b/arch/arm/plat-omap/include/mach/hwa742.h diff --git a/include/asm-arm/arch-omap/io.h b/arch/arm/plat-omap/include/mach/io.h index 449e3568baa6..2a30b7d88cde 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/arch/arm/plat-omap/include/mach/io.h @@ -1,9 +1,9 @@ /* - * linux/include/asm-arm/arch-omap/io.h + * arch/arm/plat-omap/include/mach/io.h * * IO definitions for TI OMAP processors and boards * - * Copied from linux/include/asm-arm/arch-sa1100/io.h + * Copied from arch/arm/mach-sa1100/include/mach/io.h * Copyright (C) 1997-1999 Russell King * * This program is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ #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-omap/irda.h b/arch/arm/plat-omap/include/mach/irda.h index 96bb12fab438..8372a00d8e0b 100644 --- a/include/asm-arm/arch-omap/irda.h +++ b/arch/arm/plat-omap/include/mach/irda.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/irda.h + * arch/arm/plat-omap/include/mach/irda.h * * Copyright (C) 2005-2006 Komal Shah <komal_shah802003@yahoo.com> * diff --git a/include/asm-arm/arch-omap/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h index afbf1e846468..17248bbf3f27 100644 --- a/include/asm-arm/arch-omap/irqs.h +++ b/arch/arm/plat-omap/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/irqs.h + * arch/arm/plat-omap/include/mach/irqs.h * * Copyright (C) Greg Lonnon 2001 * Updated for OMAP-1610 by Tony Lindgren <tony@atomide.com> @@ -327,6 +327,6 @@ extern void omap_init_irq(void); #endif -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #endif diff --git a/include/asm-arm/arch-omap/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h index b7f83075436e..232923aaf61d 100644 --- a/include/asm-arm/arch-omap/keypad.h +++ b/arch/arm/plat-omap/include/mach/keypad.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/keypad.h + * arch/arm/plat-omap/include/mach/keypad.h * * Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com> * diff --git a/include/asm-arm/arch-omap/lcd_mipid.h b/arch/arm/plat-omap/include/mach/lcd_mipid.h index f8fbc4801e52..f8fbc4801e52 100644 --- a/include/asm-arm/arch-omap/lcd_mipid.h +++ b/arch/arm/plat-omap/include/mach/lcd_mipid.h diff --git a/include/asm-arm/arch-omap/led.h b/arch/arm/plat-omap/include/mach/led.h index f3acae28e2da..25e451e7e2fd 100644 --- a/include/asm-arm/arch-omap/led.h +++ b/arch/arm/plat-omap/include/mach/led.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/led.h + * arch/arm/plat-omap/include/mach/led.h * * Copyright (C) 2006 Samsung Electronics * Kyungmin Park <kyungmin.park@samsung.com> diff --git a/include/asm-arm/arch-omap/mailbox.h b/arch/arm/plat-omap/include/mach/mailbox.h index 7cbed9332e16..7cbed9332e16 100644 --- a/include/asm-arm/arch-omap/mailbox.h +++ b/arch/arm/plat-omap/include/mach/mailbox.h diff --git a/include/asm-arm/arch-omap/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 3da459a282b9..6eb44a92871d 100644 --- a/include/asm-arm/arch-omap/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/mcbsp.h + * arch/arm/plat-omap/include/mach/mcbsp.h * * Defines for Multi-Channel Buffered Serial Port * @@ -27,8 +27,8 @@ #include <linux/completion.h> #include <linux/spinlock.h> -#include <asm/arch/hardware.h> -#include <asm/arch/clock.h> +#include <mach/hardware.h> +#include <mach/clock.h> #define OMAP730_MCBSP1_BASE 0xfffb1000 #define OMAP730_MCBSP2_BASE 0xfffb1800 diff --git a/include/asm-arm/arch-omap/mcspi.h b/arch/arm/plat-omap/include/mach/mcspi.h index 1254e4945b6f..1254e4945b6f 100644 --- a/include/asm-arm/arch-omap/mcspi.h +++ b/arch/arm/plat-omap/include/mach/mcspi.h diff --git a/include/asm-arm/arch-omap/memory.h b/arch/arm/plat-omap/include/mach/memory.h index 14cba97c18ad..037486c5f4a4 100644 --- a/include/asm-arm/arch-omap/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h @@ -1,12 +1,12 @@ /* - * linux/include/asm-arm/arch-omap/memory.h + * arch/arm/plat-omap/include/mach/memory.h * * Memory map for OMAP-1510 and 1610 * * Copyright (C) 2000 RidgeRun, Inc. * Author: Greg Lonnon <glonnon@ridgerun.com> * - * This file was derived from linux/include/asm-arm/arch-intergrator/memory.h + * This file was derived from arch/arm/mach-intergrator/include/mach/memory.h * Copyright (C) 1999 ARM Limited * * This program is free software; you can redistribute it and/or modify it diff --git a/include/asm-arm/arch-omap/menelaus.h b/arch/arm/plat-omap/include/mach/menelaus.h index 69ed7ee40179..3122bf68c7ce 100644 --- a/include/asm-arm/arch-omap/menelaus.h +++ b/arch/arm/plat-omap/include/mach/menelaus.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/menelaus.h + * arch/arm/plat-omap/include/mach/menelaus.h * * Functions to access Menelaus power management chip */ diff --git a/include/asm-arm/arch-omap/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h index 7cfc5f258560..fc15d13058fc 100644 --- a/include/asm-arm/arch-omap/mmc.h +++ b/arch/arm/plat-omap/include/mach/mmc.h @@ -15,7 +15,7 @@ #include <linux/device.h> #include <linux/mmc/host.h> -#include <asm/arch/board.h> +#include <mach/board.h> #define OMAP_MMC_MAX_SLOTS 2 diff --git a/include/asm-arm/arch-omap/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h index f4714b5270d0..5cee7e16a1b4 100644 --- a/include/asm-arm/arch-omap/mtd-xip.h +++ b/arch/arm/plat-omap/include/mach/mtd-xip.h @@ -14,7 +14,7 @@ #ifndef __ARCH_OMAP_MTD_XIP_H__ #define __ARCH_OMAP_MTD_XIP_H__ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define OMAP_MPU_TIMER_BASE (0xfffec500) #define OMAP_MPU_TIMER_OFFSET 0x100 diff --git a/include/asm-arm/arch-omap/mux.h b/arch/arm/plat-omap/include/mach/mux.h index ff9a5b5575fd..614b2c1327c7 100644 --- a/include/asm-arm/arch-omap/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/mux.h + * arch/arm/plat-omap/include/mach/mux.h * * Table of the Omap register configurations for the FUNC_MUX and * PULL_DWN combinations. diff --git a/include/asm-arm/arch-omap/nand.h b/arch/arm/plat-omap/include/mach/nand.h index 17ae26e35353..631a7bed1eef 100644 --- a/include/asm-arm/arch-omap/nand.h +++ b/arch/arm/plat-omap/include/mach/nand.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-omap/nand.h + * arch/arm/plat-omap/include/mach/nand.h * * Copyright (C) 2006 Micron Technology Inc. * diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/arch/arm/plat-omap/include/mach/omap-alsa.h index faa0ed23d4ba..bdf30a0f87f2 100644 --- a/include/asm-arm/arch-omap/omap-alsa.h +++ b/arch/arm/plat-omap/include/mach/omap-alsa.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/omap-alsa.h + * arch/arm/plat-omap/include/mach/omap-alsa.h * * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards. * @@ -40,10 +40,10 @@ #ifndef __OMAP_ALSA_H #define __OMAP_ALSA_H -#include <asm/arch/dma.h> +#include <mach/dma.h> #include <sound/core.h> #include <sound/pcm.h> -#include <asm/arch/mcbsp.h> +#include <mach/mcbsp.h> #include <linux/platform_device.h> #define DMA_BUF_SIZE (1024 * 8) diff --git a/include/asm-arm/arch-omap/omap1510.h b/arch/arm/plat-omap/include/mach/omap1510.h index c575d354850f..505a38af8b22 100644 --- a/include/asm-arm/arch-omap/omap1510.h +++ b/arch/arm/plat-omap/include/mach/omap1510.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-omap/omap1510.h +/* arch/arm/plat-omap/include/mach/omap1510.h * * Hardware definitions for TI OMAP1510 processor. * diff --git a/include/asm-arm/arch-omap/omap16xx.h b/arch/arm/plat-omap/include/mach/omap16xx.h index f7f5cdfdccce..c6c93afb2788 100644 --- a/include/asm-arm/arch-omap/omap16xx.h +++ b/arch/arm/plat-omap/include/mach/omap16xx.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-omap/omap16xx.h +/* arch/arm/plat-omap/include/mach/omap16xx.h * * Hardware definitions for TI OMAP1610/5912/1710 processors. * diff --git a/include/asm-arm/arch-omap/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h index b9fcaae287c8..bb8319d66e9f 100644 --- a/include/asm-arm/arch-omap/omap24xx.h +++ b/arch/arm/plat-omap/include/mach/omap24xx.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-omap/omap24xx.h + * arch/arm/plat-omap/include/mach/omap24xx.h * * This file contains the processor specific definitions * of the TI OMAP24XX. diff --git a/include/asm-arm/arch-omap/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index aa30c6d10abd..8e0479fff05a 100644 --- a/include/asm-arm/arch-omap/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-omap/omap34xx.h + * arch/arm/plat-omap/include/mach/omap34xx.h * * This file contains the processor specific definitions of the TI OMAP34XX. * diff --git a/include/asm-arm/arch-omap/omap730.h b/arch/arm/plat-omap/include/mach/omap730.h index 755b64c5e9f0..14272bc1a6fd 100644 --- a/include/asm-arm/arch-omap/omap730.h +++ b/arch/arm/plat-omap/include/mach/omap730.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-omap/omap730.h +/* arch/arm/plat-omap/include/mach/omap730.h * * Hardware definitions for TI OMAP730 processor. * diff --git a/include/asm-arm/arch-omap/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index 46d7a4f60854..cae037d13079 100644 --- a/include/asm-arm/arch-omap/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h @@ -1,5 +1,5 @@ /* - * File: include/asm-arm/arch-omap/omapfb.h + * File: arch/arm/plat-omap/include/mach/omapfb.h * * Framebuffer driver for TI OMAP boards * @@ -167,7 +167,7 @@ enum omapfb_update_mode { #include <linux/fb.h> #include <linux/mutex.h> -#include <asm/arch/board.h> +#include <mach/board.h> #define OMAP_LCDC_INV_VSYNC 0x0001 #define OMAP_LCDC_INV_HSYNC 0x0002 diff --git a/include/asm-arm/arch-omap/onenand.h b/arch/arm/plat-omap/include/mach/onenand.h index 6c959d0ce470..d57f20226b28 100644 --- a/include/asm-arm/arch-omap/onenand.h +++ b/arch/arm/plat-omap/include/mach/onenand.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-omap/onenand.h + * arch/arm/plat-omap/include/mach/onenand.h * * Copyright (C) 2006 Nokia Corporation * Author: Juha Yrjola diff --git a/include/asm-arm/arch-omap/param.h b/arch/arm/plat-omap/include/mach/param.h index face9ad41e97..1eb4dc326979 100644 --- a/include/asm-arm/arch-omap/param.h +++ b/arch/arm/plat-omap/include/mach/param.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/param.h + * arch/arm/plat-omap/include/mach/param.h * */ diff --git a/include/asm-arm/arch-omap/pm.h b/arch/arm/plat-omap/include/mach/pm.h index 14588059981f..bfa09325a5ff 100644 --- a/include/asm-arm/arch-omap/pm.h +++ b/arch/arm/plat-omap/include/mach/pm.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/pm.h + * arch/arm/plat-omap/include/mach/pm.h * * Header file for OMAP Power Management Routines * diff --git a/include/asm-arm/arch-omap/prcm.h b/arch/arm/plat-omap/include/mach/prcm.h index 7bcaf94bde9f..56eba0fd6f6a 100644 --- a/include/asm-arm/arch-omap/prcm.h +++ b/arch/arm/plat-omap/include/mach/prcm.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/prcm.h + * arch/arm/plat-omap/include/mach/prcm.h * * Access definations for use in OMAP24XX clock and power management * diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h index 673b3965befc..787b7acec546 100644 --- a/include/asm-arm/arch-omap/sdrc.h +++ b/arch/arm/plat-omap/include/mach/sdrc.h @@ -14,7 +14,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/io.h> +#include <mach/io.h> /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */ diff --git a/include/asm-arm/arch-omap/serial.h b/arch/arm/plat-omap/include/mach/serial.h index 79a5297af9fc..cc6bfa51ccb5 100644 --- a/include/asm-arm/arch-omap/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/serial.h + * arch/arm/plat-omap/include/mach/serial.h * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/asm-arm/arch-omap/sram.h b/arch/arm/plat-omap/include/mach/sram.h index be59f4a9828b..e09323449981 100644 --- a/include/asm-arm/arch-omap/sram.h +++ b/arch/arm/plat-omap/include/mach/sram.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/sram.h + * arch/arm/plat-omap/include/mach/sram.h * * Interface for functions that need to be run in internal SRAM * diff --git a/include/asm-arm/arch-omap/system.h b/arch/arm/plat-omap/include/mach/system.h index 176d9d6c258e..06a28c7b98de 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/arch/arm/plat-omap/include/mach/system.h @@ -1,5 +1,5 @@ /* - * Copied from linux/include/asm-arm/arch-sa1100/system.h + * Copied from arch/arm/mach-sa1100/include/mach/system.h * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> */ #ifndef __ASM_ARCH_SYSTEM_H @@ -7,7 +7,7 @@ #include <linux/clk.h> #include <asm/mach-types.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #ifndef CONFIG_MACH_VOICEBLUE #define voiceblue_reset() do {} while (0) diff --git a/include/asm-arm/arch-omap/tc.h b/arch/arm/plat-omap/include/mach/tc.h index 65a9c82d3bf7..d2fcd789bb9a 100644 --- a/include/asm-arm/arch-omap/tc.h +++ b/arch/arm/plat-omap/include/mach/tc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/tc.h + * arch/arm/plat-omap/include/mach/tc.h * * OMAP Traffic Controller * diff --git a/include/asm-arm/arch-omap/timex.h b/arch/arm/plat-omap/include/mach/timex.h index 21f2e367185a..6d35767bc48f 100644 --- a/include/asm-arm/arch-omap/timex.h +++ b/arch/arm/plat-omap/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/timex.h + * arch/arm/plat-omap/include/mach/timex.h * * Copyright (C) 2000 RidgeRun, Inc. * Author: Greg Lonnon <glonnon@ridgerun.com> diff --git a/include/asm-arm/arch-omap/uncompress.h b/arch/arm/plat-omap/include/mach/uncompress.h index aca0adfef1b8..0814c5f210c3 100644 --- a/include/asm-arm/arch-omap/uncompress.h +++ b/arch/arm/plat-omap/include/mach/uncompress.h @@ -1,10 +1,10 @@ /* - * linux/include/asm-arm/arch-omap/uncompress.h + * arch/arm/plat-omap/include/mach/uncompress.h * * Serial port stubs for kernel decompress status messages * * Initially based on: - * linux-2.4.15-rmk1-dsplinux1.6/include/asm-arm/arch-omap1510/uncompress.h + * linux-2.4.15-rmk1-dsplinux1.6/arch/arm/plat-omap/include/mach1510/uncompress.h * Copyright (C) 2000 RidgeRun, Inc. * Author: Greg Lonnon <glonnon@ridgerun.com> * @@ -19,7 +19,7 @@ #include <linux/types.h> #include <linux/serial_reg.h> -#include <asm/arch/serial.h> +#include <mach/serial.h> unsigned int system_rev; diff --git a/include/asm-arm/arch-omap/usb.h b/arch/arm/plat-omap/include/mach/usb.h index ddf1861e6df9..a56a610950c2 100644 --- a/include/asm-arm/arch-omap/usb.h +++ b/arch/arm/plat-omap/include/mach/usb.h @@ -3,7 +3,7 @@ #ifndef __ASM_ARCH_OMAP_USB_H #define __ASM_ARCH_OMAP_USB_H -#include <asm/arch/board.h> +#include <mach/board.h> /*-------------------------------------------------------------------------*/ diff --git a/include/asm-arm/arch-omap/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h index 5b8bd8dae8be..dc104cd96197 100644 --- a/include/asm-arm/arch-omap/vmalloc.h +++ b/arch/arm/plat-omap/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/vmalloc.h + * arch/arm/plat-omap/include/mach/vmalloc.h * * Copyright (C) 2000 Russell King. * diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index ff1413eae0b8..1d7aec1a691a 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -31,7 +31,7 @@ #include <linux/err.h> #include <linux/delay.h> #include <asm/io.h> -#include <asm/arch/mailbox.h> +#include <mach/mailbox.h> #include "mailbox.h" static struct omap_mbox *mboxes; diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index c7f74064696c..d0844050f2d2 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -24,8 +24,8 @@ #include <linux/delay.h> #include <linux/io.h> -#include <asm/arch/dma.h> -#include <asm/arch/mcbsp.h> +#include <mach/dma.h> +#include <mach/mcbsp.h> static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c index 6f3f459731c8..847df208c46c 100644 --- a/arch/arm/plat-omap/mux.c +++ b/arch/arm/plat-omap/mux.c @@ -28,7 +28,7 @@ #include <asm/system.h> #include <asm/io.h> #include <linux/spinlock.h> -#include <asm/arch/mux.h> +#include <mach/mux.h> #ifdef CONFIG_OMAP_MUX diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c index 005261a4e720..8bdbf979a257 100644 --- a/arch/arm/plat-omap/ocpi.c +++ b/arch/arm/plat-omap/ocpi.c @@ -33,7 +33,7 @@ #include <linux/clk.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define OCPI_BASE 0xfffec320 #define OCPI_FAULT (OCPI_BASE + 0x00) diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 554ee58e1294..ac67eeb6ca6a 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -22,10 +22,10 @@ #include <asm/mach/map.h> -#include <asm/arch/sram.h> -#include <asm/arch/board.h> +#include <mach/sram.h> +#include <mach/board.h> -#include <asm/arch/control.h> +#include <mach/control.h> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) # include "../mach-omap2/prm.h" diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 359912ffed7f..777485e0636b 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c @@ -31,12 +31,12 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> -#include <asm/arch/control.h> -#include <asm/arch/mux.h> -#include <asm/arch/usb.h> -#include <asm/arch/board.h> +#include <mach/control.h> +#include <mach/mux.h> +#include <mach/usb.h> +#include <mach/board.h> #ifdef CONFIG_ARCH_OMAP1 |