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 | |
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-aaec2000/include/mach/aaec2000.h (renamed from include/asm-arm/arch-aaec2000/aaec2000.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/aaed2000.h (renamed from include/asm-arm/arch-aaec2000/aaed2000.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/debug-macro.S (renamed from include/asm-arm/arch-aaec2000/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/dma.h (renamed from include/asm-arm/arch-aaec2000/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/entry-macro.S (renamed from include/asm-arm/arch-aaec2000/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/hardware.h (renamed from include/asm-arm/arch-aaec2000/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/io.h (renamed from include/asm-arm/arch-aaec2000/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/irqs.h (renamed from include/asm-arm/arch-aaec2000/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/memory.h (renamed from include/asm-arm/arch-aaec2000/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/system.h (renamed from include/asm-arm/arch-aaec2000/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/timex.h (renamed from include/asm-arm/arch-aaec2000/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/uncompress.h (renamed from include/asm-arm/arch-aaec2000/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-aaec2000/include/mach/vmalloc.h (renamed from include/asm-arm/arch-aaec2000/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_adc.h (renamed from include/asm-arm/arch-at91/at91_adc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_aic.h (renamed from include/asm-arm/arch-at91/at91_aic.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_dbgu.h (renamed from include/asm-arm/arch-at91/at91_dbgu.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_mci.h (renamed from include/asm-arm/arch-at91/at91_mci.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_pio.h (renamed from include/asm-arm/arch-at91/at91_pio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_pit.h (renamed from include/asm-arm/arch-at91/at91_pit.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_pmc.h (renamed from include/asm-arm/arch-at91/at91_pmc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_rstc.h (renamed from include/asm-arm/arch-at91/at91_rstc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_rtc.h (renamed from include/asm-arm/arch-at91/at91_rtc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_rtt.h (renamed from include/asm-arm/arch-at91/at91_rtt.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_shdwc.h (renamed from include/asm-arm/arch-at91/at91_shdwc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_spi.h (renamed from include/asm-arm/arch-at91/at91_spi.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_ssc.h (renamed from include/asm-arm/arch-at91/at91_ssc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_st.h (renamed from include/asm-arm/arch-at91/at91_st.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_tc.h (renamed from include/asm-arm/arch-at91/at91_tc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_twi.h (renamed from include/asm-arm/arch-at91/at91_twi.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_wdt.h (renamed from include/asm-arm/arch-at91/at91_wdt.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9.h (renamed from include/asm-arm/arch-at91/at91cap9.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h (renamed from include/asm-arm/arch-at91/at91cap9_ddrsdr.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9_matrix.h (renamed from include/asm-arm/arch-at91/at91cap9_matrix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91rm9200.h (renamed from include/asm-arm/arch-at91/at91rm9200.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91rm9200_emac.h (renamed from include/asm-arm/arch-at91/at91rm9200_emac.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91rm9200_mc.h (renamed from include/asm-arm/arch-at91/at91rm9200_mc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9260.h (renamed from include/asm-arm/arch-at91/at91sam9260.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9260_matrix.h (renamed from include/asm-arm/arch-at91/at91sam9260_matrix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9261.h (renamed from include/asm-arm/arch-at91/at91sam9261.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9261_matrix.h (renamed from include/asm-arm/arch-at91/at91sam9261_matrix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9263.h (renamed from include/asm-arm/arch-at91/at91sam9263.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9263_matrix.h (renamed from include/asm-arm/arch-at91/at91sam9263_matrix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9_sdramc.h (renamed from include/asm-arm/arch-at91/at91sam9_sdramc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9_smc.h (renamed from include/asm-arm/arch-at91/at91sam9_smc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9rl.h (renamed from include/asm-arm/arch-at91/at91sam9rl.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h (renamed from include/asm-arm/arch-at91/at91sam9rl_matrix.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91x40.h (renamed from include/asm-arm/arch-at91/at91x40.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/board.h (renamed from include/asm-arm/arch-at91/board.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/cpu.h (renamed from include/asm-arm/arch-at91/cpu.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/debug-macro.S (renamed from include/asm-arm/arch-at91/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/dma.h (renamed from include/asm-arm/arch-at91/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/entry-macro.S (renamed from include/asm-arm/arch-at91/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/gpio.h (renamed from include/asm-arm/arch-at91/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h (renamed from include/asm-arm/arch-at91/hardware.h) | 16 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/io.h (renamed from include/asm-arm/arch-at91/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/irqs.h (renamed from include/asm-arm/arch-at91/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/memory.h (renamed from include/asm-arm/arch-at91/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/system.h (renamed from include/asm-arm/arch-at91/system.h) | 8 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/timex.h (renamed from include/asm-arm/arch-at91/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/uncompress.h (renamed from include/asm-arm/arch-at91/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/vmalloc.h (renamed from include/asm-arm/arch-at91/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/autcpu12.h (renamed from include/asm-arm/arch-clps711x/autcpu12.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-clps711x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/dma.h (renamed from include/asm-arm/arch-clps711x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-clps711x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/hardware.h (renamed from include/asm-arm/arch-clps711x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/io.h (renamed from include/asm-arm/arch-clps711x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/irqs.h (renamed from include/asm-arm/arch-clps711x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/memory.h (renamed from include/asm-arm/arch-clps711x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/syspld.h (renamed from include/asm-arm/arch-clps711x/syspld.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/system.h (renamed from include/asm-arm/arch-clps711x/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/time.h (renamed from include/asm-arm/arch-clps711x/time.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/timex.h (renamed from include/asm-arm/arch-clps711x/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/uncompress.h (renamed from include/asm-arm/arch-clps711x/uncompress.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/vmalloc.h (renamed from include/asm-arm/arch-clps711x/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/acornfb.h (renamed from include/asm-arm/arch-cl7500/acornfb.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/debug-macro.S (renamed from include/asm-arm/arch-cl7500/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/dma.h (renamed from include/asm-arm/arch-cl7500/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/entry-macro.S (renamed from include/asm-arm/arch-rpc/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/hardware.h (renamed from include/asm-arm/arch-cl7500/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/io.h (renamed from include/asm-arm/arch-cl7500/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/irq.h (renamed from include/asm-arm/arch-cl7500/irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/irqs.h (renamed from include/asm-arm/arch-cl7500/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/memory.h (renamed from include/asm-arm/arch-cl7500/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/system.h (renamed from include/asm-arm/arch-cl7500/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/timex.h (renamed from include/asm-arm/arch-cl7500/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/uncompress.h (renamed from include/asm-arm/arch-cl7500/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/include/mach/vmalloc.h (renamed from include/asm-arm/arch-cl7500/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/clock.h (renamed from include/asm-arm/arch-davinci/clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h (renamed from include/asm-arm/arch-davinci/common.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/debug-macro.S (renamed from include/asm-arm/arch-davinci/debug-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/dma.h (renamed from include/asm-arm/arch-davinci/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/entry-macro.S (renamed from include/asm-arm/arch-davinci/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/gpio.h (renamed from include/asm-arm/arch-davinci/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h (renamed from include/asm-arm/arch-davinci/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/i2c.h (renamed from include/asm-arm/arch-davinci/i2c.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/io.h (renamed from include/asm-arm/arch-davinci/io.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/irqs.h (renamed from include/asm-arm/arch-davinci/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h (renamed from include/asm-arm/arch-davinci/memory.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/mux.h (renamed from include/asm-arm/arch-davinci/mux.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/psc.h (renamed from include/asm-arm/arch-davinci/psc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/serial.h (renamed from include/asm-arm/arch-davinci/serial.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/system.h (renamed from include/asm-arm/arch-davinci/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/timex.h (renamed from include/asm-arm/arch-davinci/timex.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/uncompress.h (renamed from include/asm-arm/arch-davinci/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/vmalloc.h (renamed from include/asm-arm/arch-davinci/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ebsa110/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/dma.h (renamed from include/asm-arm/arch-ebsa110/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ebsa110/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/hardware.h (renamed from include/asm-arm/arch-ebsa110/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/io.h (renamed from include/asm-arm/arch-ebsa110/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/irqs.h (renamed from include/asm-arm/arch-ebsa110/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/memory.h (renamed from include/asm-arm/arch-ebsa110/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/system.h (renamed from include/asm-arm/arch-ebsa110/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/timex.h (renamed from include/asm-arm/arch-ebsa110/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/uncompress.h (renamed from include/asm-arm/arch-ebsa110/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ebsa110/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ep93xx/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ep93xx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h (renamed from include/asm-arm/arch-ep93xx/ep93xx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/gpio.h (renamed from include/asm-arm/arch-ep93xx/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/hardware.h (renamed from include/asm-arm/arch-ep93xx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/io.h (renamed from include/asm-arm/arch-ep93xx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/irqs.h (renamed from include/asm-arm/arch-ep93xx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/memory.h (renamed from include/asm-arm/arch-ep93xx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/platform.h (renamed from include/asm-arm/arch-ep93xx/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/system.h (renamed from include/asm-arm/arch-ep93xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ts72xx.h (renamed from include/asm-arm/arch-ep93xx/ts72xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-ep93xx/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ebsa285/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/dma.h (renamed from include/asm-arm/arch-ebsa285/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ebsa285/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/hardware.h (renamed from include/asm-arm/arch-ebsa285/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/io.h (renamed from include/asm-arm/arch-ebsa285/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/irqs.h (renamed from include/asm-arm/arch-ebsa285/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/memory.h (renamed from include/asm-arm/arch-ebsa285/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/system.h (renamed from include/asm-arm/arch-ebsa285/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/timex.h (renamed from include/asm-arm/arch-ebsa285/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/uncompress.h (renamed from include/asm-arm/arch-ebsa285/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ebsa285/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/boards.h (renamed from include/asm-arm/arch-h720x/boards.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-h720x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/dma.h (renamed from include/asm-arm/arch-h720x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-h720x/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/h7201-regs.h (renamed from include/asm-arm/arch-h720x/h7201-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/h7202-regs.h (renamed from include/asm-arm/arch-h720x/h7202-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/hardware.h (renamed from include/asm-arm/arch-h720x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/io.h (renamed from include/asm-arm/arch-h720x/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/irqs.h (renamed from include/asm-arm/arch-h720x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/memory.h (renamed from include/asm-arm/arch-h720x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/system.h (renamed from include/asm-arm/arch-h720x/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/timex.h (renamed from include/asm-arm/arch-h720x/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/uncompress.h (renamed from include/asm-arm/arch-h720x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/vmalloc.h (renamed from include/asm-arm/arch-h720x/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-imx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/dma.h (renamed from include/asm-arm/arch-imx/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-imx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/gpio.h (renamed from include/asm-arm/arch-imx/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/hardware.h (renamed from include/asm-arm/arch-imx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-dma.h (renamed from include/asm-arm/arch-imx/imx-dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-regs.h (renamed from include/asm-arm/arch-imx/imx-regs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-uart.h (renamed from include/asm-arm/arch-imx/imx-uart.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imxfb.h (renamed from include/asm-arm/arch-imx/imxfb.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/io.h (renamed from include/asm-arm/arch-imx/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/irqs.h (renamed from include/asm-arm/arch-imx/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/memory.h (renamed from include/asm-arm/arch-imx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/mmc.h (renamed from include/asm-arm/arch-imx/mmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/mx1ads.h (renamed from include/asm-arm/arch-imx/mx1ads.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/spi_imx.h (renamed from include/asm-arm/arch-imx/spi_imx.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/system.h (renamed from include/asm-arm/arch-imx/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/timex.h (renamed from include/asm-arm/arch-imx/timex.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/uncompress.h (renamed from include/asm-arm/arch-imx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-imx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/bits.h (renamed from include/asm-arm/arch-integrator/bits.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/cm.h (renamed from include/asm-arm/arch-integrator/cm.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/debug-macro.S (renamed from include/asm-arm/arch-integrator/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/dma.h (renamed from include/asm-arm/arch-integrator/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/entry-macro.S (renamed from include/asm-arm/arch-integrator/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/hardware.h (renamed from include/asm-arm/arch-integrator/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/impd1.h (renamed from include/asm-arm/arch-integrator/impd1.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/io.h (renamed from include/asm-arm/arch-integrator/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/irqs.h (renamed from include/asm-arm/arch-integrator/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/lm.h (renamed from include/asm-arm/arch-integrator/lm.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/memory.h (renamed from include/asm-arm/arch-integrator/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/platform.h (renamed from include/asm-arm/arch-integrator/platform.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/system.h (renamed from include/asm-arm/arch-integrator/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/timex.h (renamed from include/asm-arm/arch-integrator/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/uncompress.h (renamed from include/asm-arm/arch-integrator/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/include/mach/vmalloc.h (renamed from include/asm-arm/arch-integrator/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/adma.h (renamed from include/asm-arm/arch-iop13xx/adma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop13xx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/dma.h (renamed from include/asm-arm/arch-iop13xx/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop13xx/entry-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/hardware.h (renamed from include/asm-arm/arch-iop13xx/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/io.h (renamed from include/asm-arm/arch-iop13xx/io.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/iop13xx.h (renamed from include/asm-arm/arch-iop13xx/iop13xx.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/iq81340.h (renamed from include/asm-arm/arch-iop13xx/iq81340.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/irqs.h (renamed from include/asm-arm/arch-iop13xx/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/memory.h (renamed from include/asm-arm/arch-iop13xx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/msi.h (renamed from include/asm-arm/arch-iop13xx/msi.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/pci.h (renamed from include/asm-arm/arch-iop13xx/pci.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/system.h (renamed from include/asm-arm/arch-iop13xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/time.h (renamed from include/asm-arm/arch-iop13xx/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/timex.h (renamed from include/asm-arm/arch-iop13xx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop13xx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-iop13xx/vmalloc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/adma.h (renamed from include/asm-arm/arch-iop32x/adma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop32x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/dma.h (renamed from include/asm-arm/arch-iop33x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop32x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/glantank.h (renamed from include/asm-arm/arch-iop32x/glantank.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/gpio.h (renamed from include/asm-arm/arch-iop32x/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/hardware.h (renamed from include/asm-arm/arch-iop32x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/io.h (renamed from include/asm-arm/arch-iop32x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iop32x.h (renamed from include/asm-arm/arch-iop32x/iop32x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iq31244.h (renamed from include/asm-arm/arch-iop32x/iq31244.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/iq80321.h (renamed from include/asm-arm/arch-iop32x/iq80321.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/irqs.h (renamed from include/asm-arm/arch-iop32x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/memory.h (renamed from include/asm-arm/arch-iop32x/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/n2100.h (renamed from include/asm-arm/arch-iop32x/n2100.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h (renamed from include/asm-arm/arch-iop32x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/time.h (renamed from include/asm-arm/arch-iop32x/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/timex.h (renamed from include/asm-arm/arch-iop32x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop32x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/adma.h (renamed from include/asm-arm/arch-iop33x/adma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-iop33x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/dma.h (renamed from include/asm-arm/arch-iop32x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-iop33x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/gpio.h (renamed from include/asm-arm/arch-iop33x/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/hardware.h (renamed from include/asm-arm/arch-iop33x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/io.h (renamed from include/asm-arm/arch-iop33x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iop33x.h (renamed from include/asm-arm/arch-iop33x/iop33x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iq80331.h (renamed from include/asm-arm/arch-iop33x/iq80331.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iq80332.h (renamed from include/asm-arm/arch-iop33x/iq80332.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/irqs.h (renamed from include/asm-arm/arch-iop33x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/memory.h (renamed from include/asm-arm/arch-iop33x/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/system.h (renamed from include/asm-arm/arch-iop33x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/time.h (renamed from include/asm-arm/arch-iop33x/time.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/timex.h (renamed from include/asm-arm/arch-iop33x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/uncompress.h (renamed from include/asm-arm/arch-iop33x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ixp2000/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/dma.h (renamed from include/asm-arm/arch-ixp2000/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/enp2611.h (renamed from include/asm-arm/arch-ixp2000/enp2611.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ixp2000/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/gpio.h (renamed from include/asm-arm/arch-ixp2000/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/hardware.h (renamed from include/asm-arm/arch-ixp2000/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/io.h (renamed from include/asm-arm/arch-ixp2000/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/irqs.h (renamed from include/asm-arm/arch-ixp2000/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/ixdp2x00.h (renamed from include/asm-arm/arch-ixp2000/ixdp2x00.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/ixdp2x01.h (renamed from include/asm-arm/arch-ixp2000/ixdp2x01.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h (renamed from include/asm-arm/arch-ixp2000/ixp2000-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/memory.h (renamed from include/asm-arm/arch-ixp2000/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/platform.h (renamed from include/asm-arm/arch-ixp2000/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/system.h (renamed from include/asm-arm/arch-ixp2000/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/timex.h (renamed from include/asm-arm/arch-ixp2000/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/uncompress.h (renamed from include/asm-arm/arch-ixp2000/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ixp2000/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ixp23xx/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ixp23xx/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/hardware.h (renamed from include/asm-arm/arch-ixp23xx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/io.h (renamed from include/asm-arm/arch-ixp23xx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/irqs.h (renamed from include/asm-arm/arch-ixp23xx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/ixdp2351.h (renamed from include/asm-arm/arch-ixp23xx/ixdp2351.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/ixp23xx.h (renamed from include/asm-arm/arch-ixp23xx/ixp23xx.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/memory.h (renamed from include/asm-arm/arch-ixp23xx/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/platform.h (renamed from include/asm-arm/arch-ixp23xx/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/system.h (renamed from include/asm-arm/arch-ixp23xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/timex.h (renamed from include/asm-arm/arch-ixp23xx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-ixp23xx/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ixp23xx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/avila.h (renamed from include/asm-arm/arch-ixp4xx/avila.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/coyote.h (renamed from include/asm-arm/arch-ixp4xx/coyote.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/cpu.h (renamed from include/asm-arm/arch-ixp4xx/cpu.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ixp4xx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/dma.h (renamed from include/asm-arm/arch-ixp4xx/dma.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/dsmg600.h (renamed from include/asm-arm/arch-ixp4xx/dsmg600.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ixp4xx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/fsg.h (renamed from include/asm-arm/arch-ixp4xx/fsg.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/gpio.h (renamed from include/asm-arm/arch-ixp4xx/gpio.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/gtwx5715.h (renamed from include/asm-arm/arch-ixp4xx/gtwx5715.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h (renamed from include/asm-arm/arch-ixp4xx/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/io.h (renamed from include/asm-arm/arch-ixp4xx/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/irqs.h (renamed from include/asm-arm/arch-ixp4xx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/ixdp425.h (renamed from include/asm-arm/arch-ixp4xx/ixdp425.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h (renamed from include/asm-arm/arch-ixp4xx/ixp4xx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/memory.h (renamed from include/asm-arm/arch-ixp4xx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/nas100d.h (renamed from include/asm-arm/arch-ixp4xx/nas100d.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/npe.h (renamed from include/asm-arm/arch-ixp4xx/npe.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/nslu2.h (renamed from include/asm-arm/arch-ixp4xx/nslu2.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/platform.h (renamed from include/asm-arm/arch-ixp4xx/platform.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/prpmc1100.h (renamed from include/asm-arm/arch-ixp4xx/prpmc1100.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/qmgr.h (renamed from include/asm-arm/arch-ixp4xx/qmgr.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/system.h (renamed from include/asm-arm/arch-ixp4xx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/timex.h (renamed from include/asm-arm/arch-ixp4xx/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/udc.h (renamed from include/asm-arm/arch-ixp4xx/udc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/uncompress.h (renamed from include/asm-arm/arch-ixp4xx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ixp4xx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/debug-macro.S (renamed from include/asm-arm/arch-kirkwood/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/dma.h (renamed from include/asm-arm/arch-kirkwood/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/entry-macro.S (renamed from include/asm-arm/arch-kirkwood/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/hardware.h (renamed from include/asm-arm/arch-kirkwood/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/io.h (renamed from include/asm-arm/arch-kirkwood/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/irqs.h (renamed from include/asm-arm/arch-kirkwood/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h (renamed from include/asm-arm/arch-kirkwood/kirkwood.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/memory.h (renamed from include/asm-arm/arch-mv78xx0/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/system.h (renamed from include/asm-arm/arch-mv78xx0/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/timex.h (renamed from include/asm-arm/arch-kirkwood/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/uncompress.h (renamed from include/asm-arm/arch-kirkwood/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ks8695/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/devices.h (renamed from include/asm-arm/arch-ks8695/devices.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/dma.h (renamed from include/asm-arm/arch-ks8695/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ks8695/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/gpio.h (renamed from include/asm-arm/arch-ks8695/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h (renamed from include/asm-arm/arch-ks8695/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/io.h (renamed from include/asm-arm/arch-ks8695/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/irqs.h (renamed from include/asm-arm/arch-ks8695/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/memory.h (renamed from include/asm-arm/arch-ks8695/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-gpio.h (renamed from include/asm-arm/arch-ks8695/regs-gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-hpna.h (renamed from include/asm-arm/arch-ks8695/regs-hpna.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-irq.h (renamed from include/asm-arm/arch-ks8695/regs-irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-lan.h (renamed from include/asm-arm/arch-ks8695/regs-lan.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-mem.h (renamed from include/asm-arm/arch-ks8695/regs-mem.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-misc.h (renamed from include/asm-arm/arch-ks8695/regs-misc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-pci.h (renamed from include/asm-arm/arch-ks8695/regs-pci.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-switch.h (renamed from include/asm-arm/arch-ks8695/regs-switch.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-sys.h (renamed from include/asm-arm/arch-ks8695/regs-sys.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-timer.h (renamed from include/asm-arm/arch-ks8695/regs-timer.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-uart.h (renamed from include/asm-arm/arch-ks8695/regs-uart.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/regs-wan.h (renamed from include/asm-arm/arch-ks8695/regs-wan.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/system.h (renamed from include/asm-arm/arch-ks8695/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/timex.h (renamed from include/asm-arm/arch-ks8695/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/uncompress.h (renamed from include/asm-arm/arch-ks8695/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ks8695/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/aux_reg.h (renamed from include/asm-arm/arch-l7200/aux_reg.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/debug-macro.S (renamed from include/asm-arm/arch-l7200/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/dma.h (renamed from include/asm-arm/arch-l7200/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/entry-macro.S (renamed from include/asm-arm/arch-l7200/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/gp_timers.h (renamed from include/asm-arm/arch-l7200/gp_timers.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/gpio.h (renamed from include/asm-arm/arch-l7200/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/hardware.h (renamed from include/asm-arm/arch-l7200/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/io.h (renamed from include/asm-arm/arch-l7200/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/irqs.h (renamed from include/asm-arm/arch-l7200/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/memory.h (renamed from include/asm-arm/arch-l7200/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/pmpcon.h (renamed from include/asm-arm/arch-l7200/pmpcon.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/pmu.h (renamed from include/asm-arm/arch-l7200/pmu.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/serial.h (renamed from include/asm-arm/arch-l7200/serial.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/serial_l7200.h (renamed from include/asm-arm/arch-l7200/serial_l7200.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/sib.h (renamed from include/asm-arm/arch-l7200/sib.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/sys-clock.h (renamed from include/asm-arm/arch-l7200/sys-clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/system.h (renamed from include/asm-arm/arch-l7200/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/time.h (renamed from include/asm-arm/arch-l7200/time.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/timex.h (renamed from include/asm-arm/arch-l7200/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/uncompress.h (renamed from include/asm-arm/arch-l7200/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-l7200/include/mach/vmalloc.h (renamed from include/asm-arm/arch-l7200/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/clocks.h (renamed from include/asm-arm/arch-lh7a40x/clocks.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/constants.h (renamed from include/asm-arm/arch-lh7a40x/constants.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-lh7a40x/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/dma.h (renamed from include/asm-arm/arch-lh7a40x/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-lh7a40x/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/hardware.h (renamed from include/asm-arm/arch-lh7a40x/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/io.h (renamed from include/asm-arm/arch-lh7a40x/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/irqs.h (renamed from include/asm-arm/arch-lh7a40x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/memory.h (renamed from include/asm-arm/arch-lh7a40x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/registers.h (renamed from include/asm-arm/arch-lh7a40x/registers.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/ssp.h (renamed from include/asm-arm/arch-lh7a40x/ssp.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/system.h (renamed from include/asm-arm/arch-lh7a40x/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/timex.h (renamed from include/asm-arm/arch-lh7a40x/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/uncompress.h (renamed from include/asm-arm/arch-lh7a40x/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/vmalloc.h (renamed from include/asm-arm/arch-lh7a40x/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/debug-macro.S (renamed from include/asm-arm/arch-loki/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/dma.h (renamed from include/asm-arm/arch-loki/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/entry-macro.S (renamed from include/asm-arm/arch-loki/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/hardware.h (renamed from include/asm-arm/arch-loki/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/io.h (renamed from include/asm-arm/arch-loki/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/irqs.h (renamed from include/asm-arm/arch-loki/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/loki.h (renamed from include/asm-arm/arch-loki/loki.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/memory.h (renamed from include/asm-arm/arch-kirkwood/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/system.h (renamed from include/asm-arm/arch-loki/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/timex.h (renamed from include/asm-arm/arch-loki/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-loki/include/mach/uncompress.h (renamed from include/asm-arm/arch-loki/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/board.h (renamed from include/asm-arm/arch-msm/board.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S (renamed from include/asm-arm/arch-msm/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/dma.h (renamed from include/asm-arm/arch-msm/dma.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/entry-macro.S (renamed from include/asm-arm/arch-msm/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/hardware.h (renamed from include/asm-arm/arch-msm/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/io.h (renamed from include/asm-arm/arch-msm/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/irqs.h (renamed from include/asm-arm/arch-msm/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/memory.h (renamed from include/asm-arm/arch-msm/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h (renamed from include/asm-arm/arch-msm/msm_iomap.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/system.h (renamed from include/asm-arm/arch-msm/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/timex.h (renamed from include/asm-arm/arch-msm/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/uncompress.h (renamed from include/asm-arm/arch-msm/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/vmalloc.h (renamed from include/asm-arm/arch-msm/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/debug-macro.S (renamed from include/asm-arm/arch-mv78xx0/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/dma.h (renamed from include/asm-arm/arch-mv78xx0/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/entry-macro.S (renamed from include/asm-arm/arch-mv78xx0/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/hardware.h (renamed from include/asm-arm/arch-mv78xx0/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/io.h (renamed from include/asm-arm/arch-mv78xx0/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/irqs.h (renamed from include/asm-arm/arch-mv78xx0/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/memory.h (renamed from include/asm-arm/arch-loki/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/mv78xx0.h (renamed from include/asm-arm/arch-mv78xx0/mv78xx0.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/system.h (renamed from include/asm-arm/arch-kirkwood/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/timex.h (renamed from include/asm-arm/arch-mv78xx0/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/uncompress.h (renamed from include/asm-arm/arch-mv78xx0/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-netx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/dma.h (renamed from include/asm-arm/arch-netx/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-netx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/eth.h (renamed from include/asm-arm/arch-netx/eth.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/hardware.h (renamed from include/asm-arm/arch-netx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/io.h (renamed from include/asm-arm/arch-netx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/irqs.h (renamed from include/asm-arm/arch-netx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/memory.h (renamed from include/asm-arm/arch-netx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/netx-regs.h (renamed from include/asm-arm/arch-netx/netx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/param.h (renamed from include/asm-arm/arch-netx/param.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/pfifo.h (renamed from include/asm-arm/arch-netx/pfifo.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/system.h (renamed from include/asm-arm/arch-netx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/timex.h (renamed from include/asm-arm/arch-netx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/uncompress.h (renamed from include/asm-arm/arch-netx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-netx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/xc.h (renamed from include/asm-arm/arch-netx/xc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/board.h (renamed from include/asm-arm/arch-ns9xxx/board.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-ns9xxx/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/dma.h (renamed from include/asm-arm/arch-ns9xxx/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-ns9xxx/entry-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/gpio.h (renamed from include/asm-arm/arch-ns9xxx/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/hardware.h (renamed from include/asm-arm/arch-ns9xxx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/io.h (renamed from include/asm-arm/arch-ns9xxx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/irqs.h (renamed from include/asm-arm/arch-ns9xxx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/memory.h (renamed from include/asm-arm/arch-ns9xxx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/module.h (renamed from include/asm-arm/arch-ns9xxx/module.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h (renamed from include/asm-arm/arch-ns9xxx/processor-ns9360.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/processor.h (renamed from include/asm-arm/arch-ns9xxx/processor.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/regs-bbu.h (renamed from include/asm-arm/arch-ns9xxx/regs-bbu.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h (renamed from include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/regs-mem.h (renamed from include/asm-arm/arch-ns9xxx/regs-mem.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h (renamed from include/asm-arm/arch-ns9xxx/regs-sys-common.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h (renamed from include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/system.h (renamed from include/asm-arm/arch-ns9xxx/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/timex.h (renamed from include/asm-arm/arch-ns9xxx/timex.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/uncompress.h (renamed from include/asm-arm/arch-ns9xxx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-ns9xxx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/debug-macro.S (renamed from include/asm-arm/arch-orion5x/debug-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/dma.h (renamed from include/asm-arm/arch-orion5x/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/entry-macro.S (renamed from include/asm-arm/arch-orion5x/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/gpio.h (renamed from include/asm-arm/arch-orion5x/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/hardware.h (renamed from include/asm-arm/arch-orion5x/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/io.h (renamed from include/asm-arm/arch-orion5x/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/irqs.h (renamed from include/asm-arm/arch-orion5x/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/memory.h (renamed from include/asm-arm/arch-orion5x/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/orion5x.h (renamed from include/asm-arm/arch-orion5x/orion5x.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/system.h (renamed from include/asm-arm/arch-orion5x/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/timex.h (renamed from include/asm-arm/arch-orion5x/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/uncompress.h (renamed from include/asm-arm/arch-orion5x/uncompress.h) | 4 | ||||
-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 | ||||
-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 | ||||
-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 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/acornfb.h (renamed from include/asm-arm/arch-rpc/acornfb.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/debug-macro.S (renamed from include/asm-arm/arch-rpc/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/dma.h (renamed from include/asm-arm/arch-rpc/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/entry-macro.S (renamed from include/asm-arm/arch-cl7500/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/hardware.h (renamed from include/asm-arm/arch-rpc/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/io.h (renamed from include/asm-arm/arch-rpc/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/irqs.h (renamed from include/asm-arm/arch-rpc/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/memory.h (renamed from include/asm-arm/arch-rpc/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/system.h (renamed from include/asm-arm/arch-rpc/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/timex.h (renamed from include/asm-arm/arch-rpc/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/uncompress.h (renamed from include/asm-arm/arch-rpc/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/vmalloc.h (renamed from include/asm-arm/arch-rpc/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2400/include/mach/map.h (renamed from include/asm-arm/arch-s3c2400/map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2400/include/mach/memory.h (renamed from include/asm-arm/arch-s3c2400/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/anubis-cpld.h (renamed from include/asm-arm/arch-s3c2410/anubis-cpld.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/anubis-irq.h (renamed from include/asm-arm/arch-s3c2410/anubis-irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/anubis-map.h (renamed from include/asm-arm/arch-s3c2410/anubis-map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/audio.h (renamed from include/asm-arm/arch-s3c2410/audio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/bast-cpld.h (renamed from include/asm-arm/arch-s3c2410/bast-cpld.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/bast-irq.h (renamed from include/asm-arm/arch-s3c2410/bast-irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/bast-map.h (renamed from include/asm-arm/arch-s3c2410/bast-map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/bast-pmu.h (renamed from include/asm-arm/arch-s3c2410/bast-pmu.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/debug-macro.S (renamed from include/asm-arm/arch-s3c2410/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/dma.h (renamed from include/asm-arm/arch-s3c2410/dma.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/entry-macro.S (renamed from include/asm-arm/arch-s3c2410/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/fb.h (renamed from include/asm-arm/arch-s3c2410/fb.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h (renamed from include/asm-arm/arch-s3c2410/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/h1940-latch.h (renamed from include/asm-arm/arch-s3c2410/h1940-latch.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/h1940.h (renamed from include/asm-arm/arch-s3c2410/h1940.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/hardware.h (renamed from include/asm-arm/arch-s3c2410/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/idle.h (renamed from include/asm-arm/arch-s3c2410/idle.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/io.h (renamed from include/asm-arm/arch-s3c2410/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/irqs.h (renamed from include/asm-arm/arch-s3c2410/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/leds-gpio.h (renamed from include/asm-arm/arch-s3c2410/leds-gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/map.h (renamed from include/asm-arm/arch-s3c2410/map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/memory.h (renamed from include/asm-arm/arch-s3c2410/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/osiris-cpld.h (renamed from include/asm-arm/arch-s3c2410/osiris-cpld.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/osiris-map.h (renamed from include/asm-arm/arch-s3c2410/osiris-map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/otom-map.h (renamed from include/asm-arm/arch-s3c2410/otom-map.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-clock.h (renamed from include/asm-arm/arch-s3c2410/regs-clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-dsc.h (renamed from include/asm-arm/arch-s3c2410/regs-dsc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-gpio.h (renamed from include/asm-arm/arch-s3c2410/regs-gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-gpioj.h (renamed from include/asm-arm/arch-s3c2410/regs-gpioj.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-irq.h (renamed from include/asm-arm/arch-s3c2410/regs-irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-lcd.h (renamed from include/asm-arm/arch-s3c2410/regs-lcd.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-mem.h (renamed from include/asm-arm/arch-s3c2410/regs-mem.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-power.h (renamed from include/asm-arm/arch-s3c2410/regs-power.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h (renamed from include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h (renamed from include/asm-arm/arch-s3c2410/regs-s3c2412.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h (renamed from include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-sdi.h (renamed from include/asm-arm/arch-s3c2410/regs-sdi.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/reset.h (renamed from include/asm-arm/arch-s3c2410/reset.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/spi-gpio.h (renamed from include/asm-arm/arch-s3c2410/spi-gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/spi.h (renamed from include/asm-arm/arch-s3c2410/spi.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h (renamed from include/asm-arm/arch-s3c2410/system-reset.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system.h (renamed from include/asm-arm/arch-s3c2410/system.h) | 14 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/timex.h (renamed from include/asm-arm/arch-s3c2410/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/uncompress.h (renamed from include/asm-arm/arch-s3c2410/uncompress.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/usb-control.h (renamed from include/asm-arm/arch-s3c2410/usb-control.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/vmalloc.h (renamed from include/asm-arm/arch-s3c2410/vmalloc.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h (renamed from include/asm-arm/arch-s3c2410/vr1000-cpld.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/vr1000-irq.h (renamed from include/asm-arm/arch-s3c2410/vr1000-irq.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/vr1000-map.h (renamed from include/asm-arm/arch-s3c2410/vr1000-map.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/SA-1100.h (renamed from include/asm-arm/arch-sa1100/SA-1100.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/SA-1101.h (renamed from include/asm-arm/arch-sa1100/SA-1101.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/SA-1111.h (renamed from include/asm-arm/arch-sa1100/SA-1111.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/assabet.h (renamed from include/asm-arm/arch-sa1100/assabet.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/badge4.h (renamed from include/asm-arm/arch-sa1100/badge4.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/bitfield.h (renamed from include/asm-arm/arch-sa1100/bitfield.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/cerf.h (renamed from include/asm-arm/arch-sa1100/cerf.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/collie.h (renamed from include/asm-arm/arch-sa1100/collie.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/debug-macro.S (renamed from include/asm-arm/arch-sa1100/debug-macro.S) | 6 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/dma.h (renamed from include/asm-arm/arch-sa1100/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/entry-macro.S (renamed from include/asm-arm/arch-sa1100/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/gpio.h (renamed from include/asm-arm/arch-sa1100/gpio.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/h3600.h (renamed from include/asm-arm/arch-sa1100/h3600.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/h3600_gpio.h (renamed from include/asm-arm/arch-sa1100/h3600_gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/hardware.h (renamed from include/asm-arm/arch-sa1100/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/ide.h (renamed from include/asm-arm/arch-sa1100/ide.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/io.h (renamed from include/asm-arm/arch-sa1100/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/irqs.h (renamed from include/asm-arm/arch-sa1100/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/jornada720.h (renamed from include/asm-arm/arch-sa1100/jornada720.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/lart.h (renamed from include/asm-arm/arch-sa1100/lart.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/mcp.h (renamed from include/asm-arm/arch-sa1100/mcp.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h (renamed from include/asm-arm/arch-sa1100/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/mtd-xip.h (renamed from include/asm-arm/arch-sa1100/mtd-xip.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/neponset.h (renamed from include/asm-arm/arch-sa1100/neponset.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/shannon.h (renamed from include/asm-arm/arch-sa1100/shannon.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/simpad.h (renamed from include/asm-arm/arch-sa1100/simpad.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/system.h (renamed from include/asm-arm/arch-sa1100/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/timex.h (renamed from include/asm-arm/arch-sa1100/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/uncompress.h (renamed from include/asm-arm/arch-sa1100/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/debug-macro.S (renamed from include/asm-arm/arch-shark/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/dma.h (renamed from include/asm-arm/arch-shark/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/entry-macro.S (renamed from include/asm-arm/arch-shark/entry-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h (renamed from include/asm-arm/arch-shark/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/io.h (renamed from include/asm-arm/arch-shark/io.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/irqs.h (renamed from include/asm-arm/arch-shark/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/memory.h (renamed from include/asm-arm/arch-shark/memory.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/system.h (renamed from include/asm-arm/arch-shark/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/timex.h (renamed from include/asm-arm/arch-shark/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/uncompress.h (renamed from include/asm-arm/arch-shark/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/vmalloc.h (renamed from include/asm-arm/arch-shark/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/debug-macro.S (renamed from include/asm-arm/arch-versatile/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/dma.h (renamed from include/asm-arm/arch-versatile/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/entry-macro.S (renamed from include/asm-arm/arch-versatile/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/hardware.h (renamed from include/asm-arm/arch-versatile/hardware.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/io.h (renamed from include/asm-arm/arch-versatile/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/irqs.h (renamed from include/asm-arm/arch-versatile/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/memory.h (renamed from include/asm-arm/arch-versatile/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/platform.h (renamed from include/asm-arm/arch-versatile/platform.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/system.h (renamed from include/asm-arm/arch-versatile/system.h) | 6 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/timex.h (renamed from include/asm-arm/arch-versatile/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/uncompress.h (renamed from include/asm-arm/arch-versatile/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/vmalloc.h (renamed from include/asm-arm/arch-versatile/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx27ads.h (renamed from include/asm-arm/arch-mxc/board-mx27ads.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx31ads.h (renamed from include/asm-arm/arch-mxc/board-mx31ads.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx31lite.h (renamed from include/asm-arm/arch-mxc/board-mx31lite.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/board-pcm037.h (renamed from include/asm-arm/arch-mxc/board-pcm037.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/board-pcm038.h (renamed from include/asm-arm/arch-mxc/board-pcm038.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/clock.h (renamed from include/asm-arm/arch-mxc/clock.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h (renamed from include/asm-arm/arch-mxc/common.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S (renamed from include/asm-arm/arch-mxc/debug-macro.S) | 14 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/dma.h (renamed from include/asm-arm/arch-mxc/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/entry-macro.S (renamed from include/asm-arm/arch-mxc/entry-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h (renamed from include/asm-arm/arch-mxc/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h (renamed from include/asm-arm/arch-mxc/hardware.h) | 6 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iim.h (renamed from include/asm-arm/arch-mxc/iim.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/imx-uart.h (renamed from include/asm-arm/arch-mxc/imx-uart.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/io.h (renamed from include/asm-arm/arch-mxc/io.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h (renamed from include/asm-arm/arch-mxc/iomux-mx1-mx2.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx3.h (renamed from include/asm-arm/arch-mxc/iomux-mx3.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/irqs.h (renamed from include/asm-arm/arch-mxc/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h (renamed from include/asm-arm/arch-mxc/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx27.h (renamed from include/asm-arm/arch-mxc/mx27.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h (renamed from include/asm-arm/arch-mxc/mx31.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h (renamed from include/asm-arm/arch-mxc/mxc.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_timer.h (renamed from include/asm-arm/arch-mxc/mxc_timer.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/system.h (renamed from include/asm-arm/arch-mxc/system.h) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/timex.h (renamed from include/asm-arm/arch-mxc/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/uncompress.h (renamed from include/asm-arm/arch-mxc/uncompress.h) | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/vmalloc.h (renamed from include/asm-arm/arch-mxc/vmalloc.h) | 0 | ||||
-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-- | include/asm-arm/arch-ep93xx/dma.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-ep93xx/gesbc9312.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-ep93xx/timex.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-ep93xx/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-iop32x/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-iop33x/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-ixp23xx/dma.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-ixp23xx/time.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-kirkwood/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-loki/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-mv78xx0/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-orion5x/vmalloc.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-sa1100/vmalloc.h | 4 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/iic.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/nand.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-ac97.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-adc.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-iic.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-nand.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-rtc.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-serial.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-timer.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-watchdog.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-iis.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-spi.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c24xx/regs-udc.h | 2 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c24xx/udc.h | 2 |
793 files changed, 928 insertions, 984 deletions
diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/arch/arm/mach-aaec2000/include/mach/aaec2000.h index a6d1ee0980f2..bc729c42f843 100644 --- a/include/asm-arm/arch-aaec2000/aaec2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaec2000.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/aaec2000.h + * arch/arm/mach-aaec2000/include/mach/aaec2000.h * * AAEC-2000 registers definition * diff --git a/include/asm-arm/arch-aaec2000/aaed2000.h b/arch/arm/mach-aaec2000/include/mach/aaed2000.h index bc76d2badb91..f821295ca71b 100644 --- a/include/asm-arm/arch-aaec2000/aaed2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaed2000.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/aaed2000.h + * arch/arm/mach-aaec2000/include/mach/aaed2000.h * * AAED-2000 specific bits definition * diff --git a/include/asm-arm/arch-aaec2000/debug-macro.S b/arch/arm/mach-aaec2000/include/mach/debug-macro.S index 7b1fce021d8a..0b6351d7c389 100644 --- a/include/asm-arm/arch-aaec2000/debug-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-aaec2000/debug-macro.S +/* arch/arm/mach-aaec2000/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-aaec2000/dma.h b/arch/arm/mach-aaec2000/include/mach/dma.h index e100b1e526fe..2da846c72fe7 100644 --- a/include/asm-arm/arch-aaec2000/dma.h +++ b/arch/arm/mach-aaec2000/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/dma.h + * arch/arm/mach-aaec2000/include/mach/dma.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/entry-macro.S b/arch/arm/mach-aaec2000/include/mach/entry-macro.S index 83fdf68f6b7c..c8fb34469007 100644 --- a/include/asm-arm/arch-aaec2000/entry-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/entry-macro.S + * arch/arm/mach-aaec2000/include/mach/entry-macro.S * * Low-level IRQ helper for aaec-2000 based platforms * @@ -10,7 +10,7 @@ * published by the Free Software Foundation. * */ -#include <asm/arch/irqs.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-aaec2000/hardware.h b/arch/arm/mach-aaec2000/include/mach/hardware.h index 153506fd06ed..965a6f6672d6 100644 --- a/include/asm-arm/arch-aaec2000/hardware.h +++ b/arch/arm/mach-aaec2000/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/hardware.h + * arch/arm/mach-aaec2000/include/mach/hardware.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * @@ -12,7 +12,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/aaec2000.h> +#include <mach/aaec2000.h> /* The kernel is loaded at physical address 0xf8000000. * We map the IO space a bit after diff --git a/include/asm-arm/arch-aaec2000/io.h b/arch/arm/mach-aaec2000/include/mach/io.h index bc2364ab8752..c87c24de1110 100644 --- a/include/asm-arm/arch-aaec2000/io.h +++ b/arch/arm/mach-aaec2000/include/mach/io.h @@ -1,12 +1,12 @@ /* - * linux/include/asm-arm/arch-aaec2000/io.h + * arch/arm/mach-aaec2000/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-aaec2000/irqs.h b/arch/arm/mach-aaec2000/include/mach/irqs.h index de252220e806..bf45c6d2f294 100644 --- a/include/asm-arm/arch-aaec2000/irqs.h +++ b/arch/arm/mach-aaec2000/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/irqs.h + * arch/arm/mach-aaec2000/include/mach/irqs.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h index 9eceb4148922..56ae900a482e 100644 --- a/include/asm-arm/arch-aaec2000/memory.h +++ b/arch/arm/mach-aaec2000/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/memory.h + * arch/arm/mach-aaec2000/include/mach/memory.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/system.h b/arch/arm/mach-aaec2000/include/mach/system.h index 08de97b407a8..8f4115d734ce 100644 --- a/include/asm-arm/arch-aaec2000/system.h +++ b/arch/arm/mach-aaec2000/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaed2000/system.h + * arch/arm/mach-aaed2000/include/mach/system.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/timex.h b/arch/arm/mach-aaec2000/include/mach/timex.h index f5708b38fb7f..6c8edf4a8828 100644 --- a/include/asm-arm/arch-aaec2000/timex.h +++ b/arch/arm/mach-aaec2000/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/timex.h + * arch/arm/mach-aaec2000/include/mach/timex.h * * AAEC-2000 Architecture timex specification * diff --git a/include/asm-arm/arch-aaec2000/uncompress.h b/arch/arm/mach-aaec2000/include/mach/uncompress.h index 300f4bf3bc74..381ecad1a1bb 100644 --- a/include/asm-arm/arch-aaec2000/uncompress.h +++ b/arch/arm/mach-aaec2000/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/uncompress.h + * arch/arm/mach-aaec2000/include/mach/uncompress.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/vmalloc.h b/arch/arm/mach-aaec2000/include/mach/vmalloc.h index ecb991e2e4ff..551f68f666bf 100644 --- a/include/asm-arm/arch-aaec2000/vmalloc.h +++ b/arch/arm/mach-aaec2000/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/vmalloc.h + * arch/arm/mach-aaec2000/include/mach/vmalloc.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-at91/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h index 6d71ea2637b1..8e7ed5c90817 100644 --- a/include/asm-arm/arch-at91/at91_adc.h +++ b/arch/arm/mach-at91/include/mach/at91_adc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_adc.h + * arch/arm/mach-at91/include/mach/at91_adc.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h index df44c12a12d4..03566799d3be 100644 --- a/include/asm-arm/arch-at91/at91_aic.h +++ b/arch/arm/mach-at91/include/mach/at91_aic.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_aic.h + * arch/arm/mach-at91/include/mach/at91_aic.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h index 8019ffd0ad3b..6dcaa7716871 100644 --- a/include/asm-arm/arch-at91/at91_dbgu.h +++ b/arch/arm/mach-at91/include/mach/at91_dbgu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_dbgu.h + * arch/arm/mach-at91/include/mach/at91_dbgu.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h index 400ec10014b4..550d503a1bca 100644 --- a/include/asm-arm/arch-at91/at91_mci.h +++ b/arch/arm/mach-at91/include/mach/at91_mci.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_mci.h + * arch/arm/mach-at91/include/mach/at91_mci.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h index 84c3866d309f..c6a31bf8a5c6 100644 --- a/include/asm-arm/arch-at91/at91_pio.h +++ b/arch/arm/mach-at91/include/mach/at91_pio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_pio.h + * arch/arm/mach-at91/include/mach/at91_pio.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h index 5026325a5ae4..0448ac36eadb 100644 --- a/include/asm-arm/arch-at91/at91_pit.h +++ b/arch/arm/mach-at91/include/mach/at91_pit.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_pit.h + * arch/arm/mach-at91/include/mach/at91_pit.h * * Periodic Interval Timer (PIT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h index 2001e81f2267..2e3f2894b704 100644 --- a/include/asm-arm/arch-at91/at91_pmc.h +++ b/arch/arm/mach-at91/include/mach/at91_pmc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_pmc.h + * arch/arm/mach-at91/include/mach/at91_pmc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h index fb8d1618a231..7cd1b39aaa43 100644 --- a/include/asm-arm/arch-at91/at91_rstc.h +++ b/arch/arm/mach-at91/include/mach/at91_rstc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_rstc.h + * arch/arm/mach-at91/include/mach/at91_rstc.h * * Reset Controller (RSTC) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91_rtc.h b/arch/arm/mach-at91/include/mach/at91_rtc.h index af9bd28174c0..e56f4701a3e5 100644 --- a/include/asm-arm/arch-at91/at91_rtc.h +++ b/arch/arm/mach-at91/include/mach/at91_rtc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_rtc.h + * arch/arm/mach-at91/include/mach/at91_rtc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h index 39a32633b275..71782e5d2159 100644 --- a/include/asm-arm/arch-at91/at91_rtt.h +++ b/arch/arm/mach-at91/include/mach/at91_rtt.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_rtt.h + * arch/arm/mach-at91/include/mach/at91_rtt.h * * Real-time Timer (RTT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91_shdwc.h b/arch/arm/mach-at91/include/mach/at91_shdwc.h index 581fa41d90e8..60be5ae624f1 100644 --- a/include/asm-arm/arch-at91/at91_shdwc.h +++ b/arch/arm/mach-at91/include/mach/at91_shdwc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_shdwc.h + * arch/arm/mach-at91/include/mach/at91_shdwc.h * * Shutdown Controller (SHDWC) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h index f9b9a8464997..2f6ba0c5636e 100644 --- a/include/asm-arm/arch-at91/at91_spi.h +++ b/arch/arm/mach-at91/include/mach/at91_spi.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_spi.h + * arch/arm/mach-at91/include/mach/at91_spi.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_ssc.h b/arch/arm/mach-at91/include/mach/at91_ssc.h index 0ecc73460b50..a81114c11c74 100644 --- a/include/asm-arm/arch-at91/at91_ssc.h +++ b/arch/arm/mach-at91/include/mach/at91_ssc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_ssc.h + * arch/arm/mach-at91/include/mach/at91_ssc.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h index 30446e2ea772..8847173e4101 100644 --- a/include/asm-arm/arch-at91/at91_st.h +++ b/arch/arm/mach-at91/include/mach/at91_st.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_st.h + * arch/arm/mach-at91/include/mach/at91_st.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h index b85d3faeef5c..46a317fd7164 100644 --- a/include/asm-arm/arch-at91/at91_tc.h +++ b/arch/arm/mach-at91/include/mach/at91_tc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_tc.h + * arch/arm/mach-at91/include/mach/at91_tc.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91/at91_twi.h b/arch/arm/mach-at91/include/mach/at91_twi.h index f9f2e3cd95c5..bb2880f6ba37 100644 --- a/include/asm-arm/arch-at91/at91_twi.h +++ b/arch/arm/mach-at91/include/mach/at91_twi.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_twi.h + * arch/arm/mach-at91/include/mach/at91_twi.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h index 1014e9bf181f..973b4526a98e 100644 --- a/include/asm-arm/arch-at91/at91_wdt.h +++ b/arch/arm/mach-at91/include/mach/at91_wdt.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91_wdt.h + * arch/arm/mach-at91/include/mach/at91_wdt.h * * Watchdog Timer (WDT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 6f14d9053ac7..4a4b64135a92 100644 --- a/include/asm-arm/arch-at91/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91cap9.h + * arch/arm/mach-at91/include/mach/at91cap9.h * * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> diff --git a/include/asm-arm/arch-at91/at91cap9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h index efdb23af1ee4..bca878f3bd87 100644 --- a/include/asm-arm/arch-at91/at91cap9_ddrsdr.h +++ b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91cap9_ddrsdr.h + * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h * * DDR/SDR Controller (DDRSDRC) - System peripherals registers. * Based on AT91CAP9 datasheet revision B. diff --git a/include/asm-arm/arch-at91/at91cap9_matrix.h b/arch/arm/mach-at91/include/mach/at91cap9_matrix.h index ddbd4873c842..4b9d4aff4b4f 100644 --- a/include/asm-arm/arch-at91/at91cap9_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91cap9_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91cap9_matrix.h + * arch/arm/mach-at91/include/mach/at91cap9_matrix.h * * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index e8fc0b1c33f4..78983155a074 100644 --- a/include/asm-arm/arch-at91/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91rm9200.h + * arch/arm/mach-at91/include/mach/at91rm9200.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91rm9200_emac.h b/arch/arm/mach-at91/include/mach/at91rm9200_emac.h index 0c417af5fe7f..b8260cd8041c 100644 --- a/include/asm-arm/arch-at91/at91rm9200_emac.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200_emac.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91rm9200_emac.h + * arch/arm/mach-at91/include/mach/at91rm9200_emac.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91rm9200_mc.h b/arch/arm/mach-at91/include/mach/at91rm9200_mc.h index 24d012939cc4..d34e4ed89349 100644 --- a/include/asm-arm/arch-at91/at91rm9200_mc.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200_mc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91rm9200_mc.h + * arch/arm/mach-at91/include/mach/at91rm9200_mc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h index 889872a3f2a9..43c396b9b4cb 100644 --- a/include/asm-arm/arch-at91/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9260.h + * arch/arm/mach-at91/include/mach/at91sam9260.h * * (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h index a8e9fec6c735..f027de5df956 100644 --- a/include/asm-arm/arch-at91/at91sam9260_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9260_matrix.h + * arch/arm/mach-at91/include/mach/at91sam9260_matrix.h * * Memory Controllers (MATRIX, EBI) - System peripherals registers. * Based on AT91SAM9260 datasheet revision B. diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index c7c4778dac49..3a348ca20773 100644 --- a/include/asm-arm/arch-at91/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9261.h + * arch/arm/mach-at91/include/mach/at91sam9261.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h index 6f072421be5b..db62b1f18300 100644 --- a/include/asm-arm/arch-at91/at91sam9261_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9261_matrix.h + * arch/arm/mach-at91/include/mach/at91sam9261_matrix.h * * Memory Controllers (MATRIX, EBI) - System peripherals registers. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 018a647311da..2091f1e42d43 100644 --- a/include/asm-arm/arch-at91/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9263.h + * arch/arm/mach-at91/include/mach/at91sam9263.h * * (C) 2007 Atmel Corporation. * diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h index 72f6e668e414..9b3efd3eb2f3 100644 --- a/include/asm-arm/arch-at91/at91sam9263_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9263_matrix.h + * arch/arm/mach-at91/include/mach/at91sam9263_matrix.h * * Copyright (C) 2006 Atmel Corporation. * diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h index d3b8b3da6b4d..1921181c63ca 100644 --- a/include/asm-arm/arch-at91/at91sam9_sdramc.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9_sdramc.h + * arch/arm/mach-at91/include/mach/at91sam9_sdramc.h * * SDRAM Controllers (SDRAMC) - System peripherals registers. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h index 9e49eed31e50..ec6ad1338b5a 100644 --- a/include/asm-arm/arch-at91/at91sam9_smc.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9_smc.h + * arch/arm/mach-at91/include/mach/at91sam9_smc.h * * Static Memory Controllers (SMC) - System peripherals registers. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h index 622e56f81d42..fc2de6c09c86 100644 --- a/include/asm-arm/arch-at91/at91sam9rl.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9260.h + * arch/arm/mach-at91/include/mach/at91sam9260.h * * Copyright (C) 2007 Atmel Corporation * diff --git a/include/asm-arm/arch-at91/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h index 84224174e6a1..5f9149071fe5 100644 --- a/include/asm-arm/arch-at91/at91sam9rl_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91sam9rl_matrix.h + * arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h * * Copyright (C) 2007 Atmel Corporation * diff --git a/include/asm-arm/arch-at91/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h index 612203e0177f..d34cdb8abdca 100644 --- a/include/asm-arm/arch-at91/at91x40.h +++ b/arch/arm/mach-at91/include/mach/at91x40.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/at91x40.h + * arch/arm/mach-at91/include/mach/at91x40.h * * (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com> * diff --git a/include/asm-arm/arch-at91/board.h b/arch/arm/mach-at91/include/mach/board.h index 48bbd854f57d..acd60f2a0724 100644 --- a/include/asm-arm/arch-at91/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/board.h + * arch/arm/mach-at91/include/mach/board.h * * Copyright (C) 2005 HP Labs * diff --git a/include/asm-arm/arch-at91/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index f24b55c9083f..dbfd9f73f80b 100644 --- a/include/asm-arm/arch-at91/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/cpu.h + * arch/arm/mach-at91/include/mach/cpu.h * * Copyright (C) 2006 SAN People * @@ -13,8 +13,8 @@ #ifndef __ASM_ARCH_CPU_H #define __ASM_ARCH_CPU_H -#include <asm/arch/hardware.h> -#include <asm/arch/at91_dbgu.h> +#include <mach/hardware.h> +#include <mach/at91_dbgu.h> #define ARCH_ID_AT91RM9200 0x09290780 diff --git a/include/asm-arm/arch-at91/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S index ff28696b6d90..29052ba66ada 100644 --- a/include/asm-arm/arch-at91/debug-macro.S +++ b/arch/arm/mach-at91/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/debug-macro.S + * arch/arm/mach-at91/include/mach/debug-macro.S * * Copyright (C) 2003-2005 SAN People * @@ -11,8 +11,8 @@ * */ -#include <asm/arch/hardware.h> -#include <asm/arch/at91_dbgu.h> +#include <mach/hardware.h> +#include <mach/at91_dbgu.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-at91/dma.h b/arch/arm/mach-at91/include/mach/dma.h index 774565412beb..e4f90c177616 100644 --- a/include/asm-arm/arch-at91/dma.h +++ b/arch/arm/mach-at91/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/dma.h + * arch/arm/mach-at91/include/mach/dma.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91/entry-macro.S b/arch/arm/mach-at91/include/mach/entry-macro.S index cbaf6050154a..7ab68f972227 100644 --- a/include/asm-arm/arch-at91/entry-macro.S +++ b/arch/arm/mach-at91/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/entry-macro.S + * arch/arm/mach-at91/include/mach/entry-macro.S * * Copyright (C) 2003-2005 SAN People * @@ -10,8 +10,8 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/hardware.h> -#include <asm/arch/at91_aic.h> +#include <mach/hardware.h> +#include <mach/at91_aic.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 0a241e2fb672..76d76e2fa69e 100644 --- a/include/asm-arm/arch-at91/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/gpio.h + * arch/arm/mach-at91/include/mach/gpio.h * * Copyright (C) 2005 HP Labs * diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 016a3a3f6633..da0b681c652c 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/hardware.h + * arch/arm/mach-at91/include/mach/hardware.h * * Copyright (C) 2003 SAN People * Copyright (C) 2003 ATMEL @@ -17,19 +17,19 @@ #include <asm/sizes.h> #if defined(CONFIG_ARCH_AT91RM9200) -#include <asm/arch/at91rm9200.h> +#include <mach/at91rm9200.h> #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) -#include <asm/arch/at91sam9260.h> +#include <mach/at91sam9260.h> #elif defined(CONFIG_ARCH_AT91SAM9261) -#include <asm/arch/at91sam9261.h> +#include <mach/at91sam9261.h> #elif defined(CONFIG_ARCH_AT91SAM9263) -#include <asm/arch/at91sam9263.h> +#include <mach/at91sam9263.h> #elif defined(CONFIG_ARCH_AT91SAM9RL) -#include <asm/arch/at91sam9rl.h> +#include <mach/at91sam9rl.h> #elif defined(CONFIG_ARCH_AT91CAP9) -#include <asm/arch/at91cap9.h> +#include <mach/at91cap9.h> #elif defined(CONFIG_ARCH_AT91X40) -#include <asm/arch/at91x40.h> +#include <mach/at91x40.h> #else #error "Unsupported AT91 processor" #endif diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/mach-at91/include/mach/io.h index f8beaa228467..1611bd03f528 100644 --- a/include/asm-arm/arch-at91/io.h +++ b/arch/arm/mach-at91/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/io.h + * arch/arm/mach-at91/include/mach/io.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91/irqs.h b/arch/arm/mach-at91/include/mach/irqs.h index 70b1216dce5d..bda29ccbcd94 100644 --- a/include/asm-arm/arch-at91/irqs.h +++ b/arch/arm/mach-at91/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/irqs.h + * arch/arm/mach-at91/include/mach/irqs.h * * Copyright (C) 2004 SAN People * @@ -22,7 +22,7 @@ #define __ASM_ARCH_IRQS_H #include <asm/io.h> -#include <asm/arch/at91_aic.h> +#include <mach/at91_aic.h> #define NR_AIC_IRQS 32 diff --git a/include/asm-arm/arch-at91/memory.h b/arch/arm/mach-at91/include/mach/memory.h index 904fbd60f0e4..9dd1b8c79b08 100644 --- a/include/asm-arm/arch-at91/memory.h +++ b/arch/arm/mach-at91/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/memory.h + * arch/arm/mach-at91/include/mach/memory.h * * Copyright (C) 2004 SAN People * @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define PHYS_OFFSET (AT91_SDRAM_BASE) diff --git a/include/asm-arm/arch-at91/system.h b/arch/arm/mach-at91/include/mach/system.h index c5e3d0357263..e712658d966c 100644 --- a/include/asm-arm/arch-at91/system.h +++ b/arch/arm/mach-at91/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/system.h + * arch/arm/mach-at91/include/mach/system.h * * Copyright (C) 2003 SAN People * @@ -21,9 +21,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/at91_st.h> -#include <asm/arch/at91_dbgu.h> +#include <mach/hardware.h> +#include <mach/at91_st.h> +#include <mach/at91_dbgu.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-at91/timex.h b/arch/arm/mach-at91/include/mach/timex.h index 67c86a89828f..d84c9948becf 100644 --- a/include/asm-arm/arch-at91/timex.h +++ b/arch/arm/mach-at91/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/timex.h + * arch/arm/mach-at91/include/mach/timex.h * * Copyright (C) 2003 SAN People * @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_TIMEX_H #define __ASM_ARCH_TIMEX_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #if defined(CONFIG_ARCH_AT91RM9200) diff --git a/include/asm-arm/arch-at91/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h index f5636a8f6132..0410d548e9b1 100644 --- a/include/asm-arm/arch-at91/uncompress.h +++ b/arch/arm/mach-at91/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/uncompress.h + * arch/arm/mach-at91/include/mach/uncompress.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91/vmalloc.h b/arch/arm/mach-at91/include/mach/vmalloc.h index bb05e70e932a..8eb459f3f5b7 100644 --- a/include/asm-arm/arch-at91/vmalloc.h +++ b/arch/arm/mach-at91/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91/vmalloc.h + * arch/arm/mach-at91/include/mach/vmalloc.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-clps711x/autcpu12.h b/arch/arm/mach-clps711x/include/mach/autcpu12.h index 1588a365f610..1588a365f610 100644 --- a/include/asm-arm/arch-clps711x/autcpu12.h +++ b/arch/arm/mach-clps711x/include/mach/autcpu12.h diff --git a/include/asm-arm/arch-clps711x/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S index bc0a5760722b..64baf9f87408 100644 --- a/include/asm-arm/arch-clps711x/debug-macro.S +++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-clps711x/debug-macro.S +/* arch/arm/mach-clps711x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-clps711x/dma.h b/arch/arm/mach-clps711x/include/mach/dma.h index 610997938423..0d620e869536 100644 --- a/include/asm-arm/arch-clps711x/dma.h +++ b/arch/arm/mach-clps711x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/dma.h + * arch/arm/mach-clps711x/include/mach/dma.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-clps711x/entry-macro.S b/arch/arm/mach-clps711x/include/mach/entry-macro.S index 3554887cbccb..90fa2f70489f 100644 --- a/include/asm-arm/arch-clps711x/entry-macro.S +++ b/arch/arm/mach-clps711x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-clps711x/entry-macro.S + * arch/arm/mach-clps711x/include/mach/entry-macro.S * * Low-level IRQ helper macros for CLPS711X-based 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/clps7111.h> .macro disable_fiq diff --git a/include/asm-arm/arch-clps711x/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h index 0fdbe72fff2a..4c3e101b96c9 100644 --- a/include/asm-arm/arch-clps711x/hardware.h +++ b/arch/arm/mach-clps711x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/hardware.h + * arch/arm/mach-clps711x/include/mach/hardware.h * * This file contains the hardware definitions of the Prospector P720T. * diff --git a/include/asm-arm/arch-clps711x/io.h b/arch/arm/mach-clps711x/include/mach/io.h index 2b84dac8b2fa..4c8440087679 100644 --- a/include/asm-arm/arch-clps711x/io.h +++ b/arch/arm/mach-clps711x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/io.h + * arch/arm/mach-clps711x/include/mach/io.h * * Copyright (C) 1999 ARM Limited * @@ -20,7 +20,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-clps711x/irqs.h b/arch/arm/mach-clps711x/include/mach/irqs.h index 76025dc87637..30b7e97285a4 100644 --- a/include/asm-arm/arch-clps711x/irqs.h +++ b/arch/arm/mach-clps711x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/irqs.h + * arch/arm/mach-clps711x/include/mach/irqs.h * * Copyright (C) 2000 Deep Blue Solutions Ltd. * diff --git a/include/asm-arm/arch-clps711x/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h index 42768cc8bfb4..71c2fa70c8e8 100644 --- a/include/asm-arm/arch-clps711x/memory.h +++ b/arch/arm/mach-clps711x/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/memory.h + * arch/arm/mach-clps711x/include/mach/memory.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-clps711x/syspld.h b/arch/arm/mach-clps711x/include/mach/syspld.h index 960578a22a8e..f7f4c1201898 100644 --- a/include/asm-arm/arch-clps711x/syspld.h +++ b/arch/arm/mach-clps711x/include/mach/syspld.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/syspld.h + * arch/arm/mach-clps711x/include/mach/syspld.h * * System Control PLD register definitions. * diff --git a/include/asm-arm/arch-clps711x/system.h b/arch/arm/mach-clps711x/include/mach/system.h index 1f561772bee4..a8eade40317f 100644 --- a/include/asm-arm/arch-clps711x/system.h +++ b/arch/arm/mach-clps711x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/system.h + * arch/arm/mach-clps711x/include/mach/system.h * * Copyright (C) 2000 Deep Blue Solutions Ltd * @@ -20,7 +20,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/clps7111.h> #include <asm/io.h> diff --git a/include/asm-arm/arch-clps711x/time.h b/arch/arm/mach-clps711x/include/mach/time.h index 5edaae1c61d3..8fe283ccd1f3 100644 --- a/include/asm-arm/arch-clps711x/time.h +++ b/arch/arm/mach-clps711x/include/mach/time.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/time.h + * arch/arm/mach-clps711x/include/mach/time.h * * Copyright (C) 2000 Deep Blue Solutions Ltd. * diff --git a/include/asm-arm/arch-clps711x/timex.h b/arch/arm/mach-clps711x/include/mach/timex.h index dcbb381da3dd..ac8823ccff93 100644 --- a/include/asm-arm/arch-clps711x/timex.h +++ b/arch/arm/mach-clps711x/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/timex.h + * arch/arm/mach-clps711x/include/mach/timex.h * * Prospector 720T architecture timex specifications * diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/arch/arm/mach-clps711x/include/mach/uncompress.h index 8c5684ad086e..7164310dea7c 100644 --- a/include/asm-arm/arch-clps711x/uncompress.h +++ b/arch/arm/mach-clps711x/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/uncompress.h + * arch/arm/mach-clps711x/include/mach/uncompress.h * * Copyright (C) 2000 Deep Blue Solutions Ltd * @@ -17,8 +17,8 @@ * 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/io.h> -#include <asm/arch/hardware.h> +#include <mach/io.h> +#include <mach/hardware.h> #include <asm/hardware/clps7111.h> #undef CLPS7111_BASE diff --git a/include/asm-arm/arch-clps711x/vmalloc.h b/arch/arm/mach-clps711x/include/mach/vmalloc.h index a5dfe96abc96..ea6cc7beff28 100644 --- a/include/asm-arm/arch-clps711x/vmalloc.h +++ b/arch/arm/mach-clps711x/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-clps711x/vmalloc.h + * arch/arm/mach-clps711x/include/mach/vmalloc.h * * Copyright (C) 2000 Deep Blue Solutions Ltd. * diff --git a/include/asm-arm/arch-cl7500/acornfb.h b/arch/arm/mach-clps7500/include/mach/acornfb.h index aea6330c9745..aea6330c9745 100644 --- a/include/asm-arm/arch-cl7500/acornfb.h +++ b/arch/arm/mach-clps7500/include/mach/acornfb.h diff --git a/include/asm-arm/arch-cl7500/debug-macro.S b/arch/arm/mach-clps7500/include/mach/debug-macro.S index 9a2b67d24098..af4104e7e84a 100644 --- a/include/asm-arm/arch-cl7500/debug-macro.S +++ b/arch/arm/mach-clps7500/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-cl7500/debug-macro.S +/* arch/arm/mach-clps7500/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-cl7500/dma.h b/arch/arm/mach-clps7500/include/mach/dma.h index 591ed2551892..63fcde505498 100644 --- a/include/asm-arm/arch-cl7500/dma.h +++ b/arch/arm/mach-clps7500/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/dma.h + * arch/arm/mach-clps7500/include/mach/dma.h * * Copyright (C) 1999 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-rpc/entry-macro.S b/arch/arm/mach-clps7500/include/mach/entry-macro.S index 5bd55557ccca..4e7e54144093 100644 --- a/include/asm-arm/arch-rpc/entry-macro.S +++ b/arch/arm/mach-clps7500/include/mach/entry-macro.S @@ -1,4 +1,4 @@ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/entry-macro-iomd.S> .equ ioc_base_high, IOC_BASE & 0xff000000 diff --git a/include/asm-arm/arch-cl7500/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h index 1adfd18e6154..d66578a3371c 100644 --- a/include/asm-arm/arch-cl7500/hardware.h +++ b/arch/arm/mach-clps7500/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/hardware.h + * arch/arm/mach-clps7500/include/mach/hardware.h * * Copyright (C) 1996-1999 Russell King. * Copyright (C) 1999 Nexus Electronics Ltd. @@ -10,7 +10,7 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include <asm/arch/memory.h> +#include <mach/memory.h> #include <asm/hardware/iomd.h> #ifdef __ASSEMBLY__ diff --git a/include/asm-arm/arch-cl7500/io.h b/arch/arm/mach-clps7500/include/mach/io.h index 80f9b19cac9e..2ff2860889ed 100644 --- a/include/asm-arm/arch-cl7500/io.h +++ b/arch/arm/mach-clps7500/include/mach/io.h @@ -1,6 +1,6 @@ /* - * linux/include/asm-arm/arch-cl7500/io.h - * from linux/include/asm-arm/arch-rpc/io.h + * arch/arm/mach-clps7500/include/mach/io.h + * from arch/arm/mach-rpc/include/mach/io.h * * Copyright (C) 1997 Russell King * @@ -10,7 +10,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-cl7500/irq.h b/arch/arm/mach-clps7500/include/mach/irq.h index 4b286331f3f8..e8da3c58df76 100644 --- a/include/asm-arm/arch-cl7500/irq.h +++ b/arch/arm/mach-clps7500/include/mach/irq.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-cl7500/irq.h + * arch/arm/mach-clps7500/include/mach/irq.h * * Copyright (C) 1996 Russell King * Copyright (C) 1999, 2001 Nexus Electronics Ltd. diff --git a/include/asm-arm/arch-cl7500/irqs.h b/arch/arm/mach-clps7500/include/mach/irqs.h index f20996eadf19..bee66b487f59 100644 --- a/include/asm-arm/arch-cl7500/irqs.h +++ b/arch/arm/mach-clps7500/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/irqs.h + * arch/arm/mach-clps7500/include/mach/irqs.h * * Copyright (C) 1999 Nexus Electronics Ltd */ diff --git a/include/asm-arm/arch-cl7500/memory.h b/arch/arm/mach-clps7500/include/mach/memory.h index 3178140e24ca..3326aa99d3ec 100644 --- a/include/asm-arm/arch-cl7500/memory.h +++ b/arch/arm/mach-clps7500/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/memory.h + * arch/arm/mach-clps7500/include/mach/memory.h * * Copyright (c) 1996,1997,1998 Russell King. * diff --git a/include/asm-arm/arch-cl7500/system.h b/arch/arm/mach-clps7500/include/mach/system.h index a9505d6a74d7..624fc2830ae0 100644 --- a/include/asm-arm/arch-cl7500/system.h +++ b/arch/arm/mach-clps7500/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/system.h + * arch/arm/mach-clps7500/include/mach/system.h * * Copyright (c) 1999 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-cl7500/timex.h b/arch/arm/mach-clps7500/include/mach/timex.h index 8a4175fc0106..dfaa9b425757 100644 --- a/include/asm-arm/arch-cl7500/timex.h +++ b/arch/arm/mach-clps7500/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/timex.h + * arch/arm/mach-clps7500/include/mach/timex.h * * CL7500 architecture timex specifications * diff --git a/include/asm-arm/arch-cl7500/uncompress.h b/arch/arm/mach-clps7500/include/mach/uncompress.h index c437e0c88c3f..d7d0af4b49fc 100644 --- a/include/asm-arm/arch-cl7500/uncompress.h +++ b/arch/arm/mach-clps7500/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-cl7500/uncompress.h + * arch/arm/mach-clps7500/include/mach/uncompress.h * * Copyright (C) 1999, 2000 Nexus Electronics Ltd. */ diff --git a/include/asm-arm/arch-cl7500/vmalloc.h b/arch/arm/mach-clps7500/include/mach/vmalloc.h index ba8d7a84456a..8fc5406d1b6d 100644 --- a/include/asm-arm/arch-cl7500/vmalloc.h +++ b/arch/arm/mach-clps7500/include/mach/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-cl7500/vmalloc.h + * arch/arm/mach-clps7500/include/mach/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x1c000000) diff --git a/include/asm-arm/arch-davinci/clock.h b/arch/arm/mach-davinci/include/mach/clock.h index cc168b7a14f2..38bdd49bc181 100644 --- a/include/asm-arm/arch-davinci/clock.h +++ b/arch/arm/mach-davinci/include/mach/clock.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-davinci/clock.h + * arch/arm/mach-davinci/include/mach/clock.h * * Clock control driver for DaVinci - header file * diff --git a/include/asm-arm/arch-davinci/common.h b/arch/arm/mach-davinci/include/mach/common.h index a97dfbb15e57..a97dfbb15e57 100644 --- a/include/asm-arm/arch-davinci/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h diff --git a/include/asm-arm/arch-davinci/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index e6c0f0d5d062..e6c0f0d5d062 100644 --- a/include/asm-arm/arch-davinci/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S diff --git a/include/asm-arm/arch-davinci/dma.h b/arch/arm/mach-davinci/include/mach/dma.h index 8e2f2d0ba667..8e2f2d0ba667 100644 --- a/include/asm-arm/arch-davinci/dma.h +++ b/arch/arm/mach-davinci/include/mach/dma.h diff --git a/include/asm-arm/arch-davinci/entry-macro.S b/arch/arm/mach-davinci/include/mach/entry-macro.S index 3ebfcc5cb58e..039b84f933b3 100644 --- a/include/asm-arm/arch-davinci/entry-macro.S +++ b/arch/arm/mach-davinci/include/mach/entry-macro.S @@ -8,8 +8,8 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ -#include <asm/arch/io.h> -#include <asm/arch/irqs.h> +#include <mach/io.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-davinci/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h index 54fda734649f..ec151ccf1e8f 100644 --- a/include/asm-arm/arch-davinci/gpio.h +++ b/arch/arm/mach-davinci/include/mach/gpio.h @@ -14,7 +14,7 @@ #define __DAVINCI_GPIO_H #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * basic gpio routines diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index a2e8969afaca..a2e8969afaca 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h diff --git a/include/asm-arm/arch-davinci/i2c.h b/arch/arm/mach-davinci/include/mach/i2c.h index e2f54168abd1..e2f54168abd1 100644 --- a/include/asm-arm/arch-davinci/i2c.h +++ b/arch/arm/mach-davinci/include/mach/i2c.h diff --git a/include/asm-arm/arch-davinci/io.h b/arch/arm/mach-davinci/include/mach/io.h index e7accb910864..e7accb910864 100644 --- a/include/asm-arm/arch-davinci/io.h +++ b/arch/arm/mach-davinci/include/mach/io.h diff --git a/include/asm-arm/arch-davinci/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index f4c5ca6da9f4..f4c5ca6da9f4 100644 --- a/include/asm-arm/arch-davinci/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h diff --git a/include/asm-arm/arch-davinci/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index dd1625c23cf4..dd1625c23cf4 100644 --- a/include/asm-arm/arch-davinci/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h diff --git a/include/asm-arm/arch-davinci/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index c24b6782804d..c24b6782804d 100644 --- a/include/asm-arm/arch-davinci/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h diff --git a/include/asm-arm/arch-davinci/psc.h b/arch/arm/mach-davinci/include/mach/psc.h index 4977aa071e1e..4977aa071e1e 100644 --- a/include/asm-arm/arch-davinci/psc.h +++ b/arch/arm/mach-davinci/include/mach/psc.h diff --git a/include/asm-arm/arch-davinci/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index ed418ef76805..fb8cb229bfd2 100644 --- a/include/asm-arm/arch-davinci/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_SERIAL_H #define __ASM_ARCH_SERIAL_H -#include <asm/arch/io.h> +#include <mach/io.h> #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) diff --git a/include/asm-arm/arch-davinci/system.h b/arch/arm/mach-davinci/include/mach/system.h index 6713e4a44ee8..84ff77aeb738 100644 --- a/include/asm-arm/arch-davinci/system.h +++ b/arch/arm/mach-davinci/include/mach/system.h @@ -12,7 +12,7 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> extern void davinci_watchdog_reset(void); diff --git a/include/asm-arm/arch-davinci/timex.h b/arch/arm/mach-davinci/include/mach/timex.h index 52827567841d..52827567841d 100644 --- a/include/asm-arm/arch-davinci/timex.h +++ b/arch/arm/mach-davinci/include/mach/timex.h diff --git a/include/asm-arm/arch-davinci/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index f6d1570f7206..8c165def37b6 100644 --- a/include/asm-arm/arch-davinci/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -11,7 +11,7 @@ #include <linux/types.h> #include <linux/serial_reg.h> -#include <asm/arch/serial.h> +#include <mach/serial.h> /* PORT_16C550A, in polled non-fifo mode */ diff --git a/include/asm-arm/arch-davinci/vmalloc.h b/arch/arm/mach-davinci/include/mach/vmalloc.h index 9b47fa89b333..b98bd9e92fd6 100644 --- a/include/asm-arm/arch-davinci/vmalloc.h +++ b/arch/arm/mach-davinci/include/mach/vmalloc.h @@ -9,7 +9,7 @@ * or implied. */ #include <asm/memory.h> -#include <asm/arch/io.h> +#include <mach/io.h> /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */ #define VMALLOC_END (IO_VIRT - (2<<20)) diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S index 9213bfe4831d..1dde8227f3a2 100644 --- a/include/asm-arm/arch-ebsa110/debug-macro.S +++ b/arch/arm/mach-ebsa110/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-ebsa110/debug-macro.S +/* arch/arm/mach-ebsa110/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-ebsa110/dma.h b/arch/arm/mach-ebsa110/include/mach/dma.h index c52f9e2ab0bb..780a04c8bbe9 100644 --- a/include/asm-arm/arch-ebsa110/dma.h +++ b/arch/arm/mach-ebsa110/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/dma.h + * arch/arm/mach-ebsa110/include/mach/dma.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/entry-macro.S b/arch/arm/mach-ebsa110/include/mach/entry-macro.S index f242be5c49ba..cc3e5992f6b3 100644 --- a/include/asm-arm/arch-ebsa110/entry-macro.S +++ b/arch/arm/mach-ebsa110/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ebsa110/entry-macro.S + * arch/arm/mach-ebsa110/include/mach/entry-macro.S * * Low-level IRQ helper macros for ebsa110 platform. * diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/arch/arm/mach-ebsa110/include/mach/hardware.h index 3ce864def41e..4b2fb7743909 100644 --- a/include/asm-arm/arch-ebsa110/hardware.h +++ b/arch/arm/mach-ebsa110/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/hardware.h + * arch/arm/mach-ebsa110/include/mach/hardware.h * * Copyright (C) 1996-2000 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/io.h b/arch/arm/mach-ebsa110/include/mach/io.h index 44a4001de807..f68daa632af0 100644 --- a/include/asm-arm/arch-ebsa110/io.h +++ b/arch/arm/mach-ebsa110/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/io.h + * arch/arm/mach-ebsa110/include/mach/io.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/irqs.h b/arch/arm/mach-ebsa110/include/mach/irqs.h index ded9bd9d7b8b..a8f3771bc060 100644 --- a/include/asm-arm/arch-ebsa110/irqs.h +++ b/arch/arm/mach-ebsa110/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/irqs.h + * arch/arm/mach-ebsa110/include/mach/irqs.h * * Copyright (C) 1996 Russell King * diff --git a/include/asm-arm/arch-ebsa110/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h index c7c500e176d0..eea4b75b657b 100644 --- a/include/asm-arm/arch-ebsa110/memory.h +++ b/arch/arm/mach-ebsa110/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/memory.h + * arch/arm/mach-ebsa110/include/mach/memory.h * * Copyright (C) 1996-1999 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/system.h b/arch/arm/mach-ebsa110/include/mach/system.h index d7c8fece0bc5..350a028997ef 100644 --- a/include/asm-arm/arch-ebsa110/system.h +++ b/arch/arm/mach-ebsa110/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/system.h + * arch/arm/mach-ebsa110/include/mach/system.h * * Copyright (C) 1996-2000 Russell King. * diff --git a/include/asm-arm/arch-ebsa110/timex.h b/arch/arm/mach-ebsa110/include/mach/timex.h index 1e9ef045092b..4fb43b22a102 100644 --- a/include/asm-arm/arch-ebsa110/timex.h +++ b/arch/arm/mach-ebsa110/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/timex.h + * arch/arm/mach-ebsa110/include/mach/timex.h * * Copyright (C) 1997, 1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/arch/arm/mach-ebsa110/include/mach/uncompress.h index ae5b775eb0b7..32041509fbf8 100644 --- a/include/asm-arm/arch-ebsa110/uncompress.h +++ b/arch/arm/mach-ebsa110/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/uncompress.h + * arch/arm/mach-ebsa110/include/mach/uncompress.h * * Copyright (C) 1996,1997,1998 Russell King * diff --git a/include/asm-arm/arch-ebsa110/vmalloc.h b/arch/arm/mach-ebsa110/include/mach/vmalloc.h index 26674ba4683c..9b44c19e95ec 100644 --- a/include/asm-arm/arch-ebsa110/vmalloc.h +++ b/arch/arm/mach-ebsa110/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa110/vmalloc.h + * arch/arm/mach-ebsa110/include/mach/vmalloc.h * * Copyright (C) 1998 Russell King * diff --git a/include/asm-arm/arch-ep93xx/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S index 397565a0c671..802858bc8095 100644 --- a/include/asm-arm/arch-ep93xx/debug-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/debug-macro.S + * arch/arm/mach-ep93xx/include/mach/debug-macro.S * Debugging macro include header * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-ep93xx/entry-macro.S b/arch/arm/mach-ep93xx/include/mach/entry-macro.S index 241ec221a047..96b85e2c2c0b 100644 --- a/include/asm-arm/arch-ep93xx/entry-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/entry-macro.S + * arch/arm/mach-ep93xx/include/mach/entry-macro.S * IRQ demultiplexing for EP93xx * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index 625c6f0abc03..9f4458c8e070 100644 --- a/include/asm-arm/arch-ep93xx/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/ep93xx-regs.h + * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h */ #ifndef __ASM_ARCH_EP93XX_REGS_H diff --git a/include/asm-arm/arch-ep93xx/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h index 186e7c715f8a..f7020414c5df 100644 --- a/include/asm-arm/arch-ep93xx/gpio.h +++ b/arch/arm/mach-ep93xx/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/gpio.h + * arch/arm/mach-ep93xx/include/mach/gpio.h */ #ifndef __ASM_ARCH_GPIO_H diff --git a/include/asm-arm/arch-ep93xx/hardware.h b/arch/arm/mach-ep93xx/include/mach/hardware.h index 4233f6e85150..529807d182bf 100644 --- a/include/asm-arm/arch-ep93xx/hardware.h +++ b/arch/arm/mach-ep93xx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/hardware.h + * arch/arm/mach-ep93xx/include/mach/hardware.h */ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H diff --git a/include/asm-arm/arch-ep93xx/io.h b/arch/arm/mach-ep93xx/include/mach/io.h index 7b4d25e29060..1ab9a90ad339 100644 --- a/include/asm-arm/arch-ep93xx/io.h +++ b/arch/arm/mach-ep93xx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/io.h + * arch/arm/mach-ep93xx/include/mach/io.h */ #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-ep93xx/irqs.h b/arch/arm/mach-ep93xx/include/mach/irqs.h index 53d4a68bfc88..ff98390bbf0f 100644 --- a/include/asm-arm/arch-ep93xx/irqs.h +++ b/arch/arm/mach-ep93xx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/irqs.h + * arch/arm/mach-ep93xx/include/mach/irqs.h */ #ifndef __ASM_ARCH_IRQS_H diff --git a/include/asm-arm/arch-ep93xx/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index 4b1a5c7c8363..f1b633590752 100644 --- a/include/asm-arm/arch-ep93xx/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/memory.h + * arch/arm/mach-ep93xx/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-ep93xx/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 44eccec2cba4..b5c182473f5d 100644 --- a/include/asm-arm/arch-ep93xx/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/platform.h + * arch/arm/mach-ep93xx/include/mach/platform.h */ #ifndef __ASSEMBLY__ diff --git a/include/asm-arm/arch-ep93xx/system.h b/arch/arm/mach-ep93xx/include/mach/system.h index f1a5acf51919..67789d0f329e 100644 --- a/include/asm-arm/arch-ep93xx/system.h +++ b/arch/arm/mach-ep93xx/include/mach/system.h @@ -1,8 +1,8 @@ /* - * linux/include/asm-arm/arch-ep93xx/system.h + * arch/arm/mach-ep93xx/include/mach/system.h */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index a94f63ff0535..30b318aa1a1f 100644 --- a/include/asm-arm/arch-ep93xx/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/ts72xx.h + * arch/arm/mach-ep93xx/include/mach/ts72xx.h */ /* diff --git a/include/asm-arm/arch-ep93xx/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index c15274c85d5d..1fd2f17de325 100644 --- a/include/asm-arm/arch-ep93xx/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/uncompress.h + * arch/arm/mach-ep93xx/include/mach/uncompress.h * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> * @@ -9,7 +9,7 @@ * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> static unsigned char __raw_readb(unsigned int ptr) { diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S index b48cec4a0c45..4329b8123570 100644 --- a/include/asm-arm/arch-ebsa285/debug-macro.S +++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-ebsa285/debug-macro.S +/* arch/arm/mach-footbridge/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-ebsa285/dma.h b/arch/arm/mach-footbridge/include/mach/dma.h index 0259ad45d33c..62afd213effb 100644 --- a/include/asm-arm/arch-ebsa285/dma.h +++ b/arch/arm/mach-footbridge/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/dma.h + * arch/arm/mach-footbridge/include/mach/dma.h * * Architecture DMA routines * diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/arch/arm/mach-footbridge/include/mach/entry-macro.S index e203c628d500..d3847be0c667 100644 --- a/include/asm-arm/arch-ebsa285/entry-macro.S +++ b/arch/arm/mach-footbridge/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ebsa285/entry-macro.S + * arch/arm/mach-footbridge/include/mach/entry-macro.S * * Low-level IRQ helper macros for footbridge-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> #include <asm/hardware/dec21285.h> .equ dc21285_high, ARMCSR_BASE & 0xff000000 diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h index 74610c2c63d4..ffaea90486f9 100644 --- a/include/asm-arm/arch-ebsa285/hardware.h +++ b/arch/arm/mach-footbridge/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/hardware.h + * arch/arm/mach-footbridge/include/mach/hardware.h * * Copyright (C) 1998-1999 Russell King. * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include <asm/arch/memory.h> +#include <mach/memory.h> /* Virtual Physical Size * 0xff800000 0x40000000 1MB X-Bus diff --git a/include/asm-arm/arch-ebsa285/io.h b/arch/arm/mach-footbridge/include/mach/io.h index e88c6e230387..a7b066239996 100644 --- a/include/asm-arm/arch-ebsa285/io.h +++ b/arch/arm/mach-footbridge/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/io.h + * arch/arm/mach-footbridge/include/mach/io.h * * Copyright (C) 1997-1999 Russell King * @@ -14,7 +14,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 0xffff diff --git a/include/asm-arm/arch-ebsa285/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h index 3e766f1cecf1..400551e43e4e 100644 --- a/include/asm-arm/arch-ebsa285/irqs.h +++ b/arch/arm/mach-footbridge/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/irqs.h + * arch/arm/mach-footbridge/include/mach/irqs.h * * Copyright (C) 1998 Russell King * Copyright (C) 1998 Phil Blundell diff --git a/include/asm-arm/arch-ebsa285/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h index 9019a3bf5ab9..e9cae99dd1f9 100644 --- a/include/asm-arm/arch-ebsa285/memory.h +++ b/arch/arm/mach-footbridge/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/memory.h + * arch/arm/mach-footbridge/include/mach/memory.h * * Copyright (C) 1996-1999 Russell King. * diff --git a/include/asm-arm/arch-ebsa285/system.h b/arch/arm/mach-footbridge/include/mach/system.h index a720bf7ca123..01c9f407f498 100644 --- a/include/asm-arm/arch-ebsa285/system.h +++ b/arch/arm/mach-footbridge/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/system.h + * arch/arm/mach-footbridge/include/mach/system.h * * Copyright (C) 1996-1999 Russell King. * @@ -9,7 +9,7 @@ */ #include <asm/hardware/dec21285.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/leds.h> #include <asm/mach-types.h> diff --git a/include/asm-arm/arch-ebsa285/timex.h b/arch/arm/mach-footbridge/include/mach/timex.h index df60b3812d96..d0fea9d6d4ab 100644 --- a/include/asm-arm/arch-ebsa285/timex.h +++ b/arch/arm/mach-footbridge/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/timex.h + * arch/arm/mach-footbridge/include/mach/timex.h * * Copyright (C) 1998 Russell King * diff --git a/include/asm-arm/arch-ebsa285/uncompress.h b/arch/arm/mach-footbridge/include/mach/uncompress.h index 86142c882b3a..5dfa44287346 100644 --- a/include/asm-arm/arch-ebsa285/uncompress.h +++ b/arch/arm/mach-footbridge/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/uncompress.h + * arch/arm/mach-footbridge/include/mach/uncompress.h * * Copyright (C) 1996-1999 Russell King * diff --git a/include/asm-arm/arch-ebsa285/vmalloc.h b/arch/arm/mach-footbridge/include/mach/vmalloc.h index e487d7e8c8a6..d0958d860a3c 100644 --- a/include/asm-arm/arch-ebsa285/vmalloc.h +++ b/arch/arm/mach-footbridge/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ebsa285/vmalloc.h + * arch/arm/mach-footbridge/include/mach/vmalloc.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-h720x/boards.h b/arch/arm/mach-h720x/include/mach/boards.h index 8021f81f0742..079b279e1242 100644 --- a/include/asm-arm/arch-h720x/boards.h +++ b/arch/arm/mach-h720x/include/mach/boards.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/boards.h + * arch/arm/mach-h720x/include/mach/boards.h * * Copyright (C) 2003 Thomas Gleixner <tglx@linutronix.de> * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de> diff --git a/include/asm-arm/arch-h720x/debug-macro.S b/arch/arm/mach-h720x/include/mach/debug-macro.S index 82822d362733..6294a1344dda 100644 --- a/include/asm-arm/arch-h720x/debug-macro.S +++ b/arch/arm/mach-h720x/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-h720x/debug-macro.S +/* arch/arm/mach-h720x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-h720x/dma.h b/arch/arm/mach-h720x/include/mach/dma.h index bfc6636679f7..0a9d86ee84fe 100644 --- a/include/asm-arm/arch-h720x/dma.h +++ b/arch/arm/mach-h720x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/dma.h + * arch/arm/mach-h720x/include/mach/dma.h * * Architecture DMA routes * diff --git a/include/asm-arm/arch-h720x/entry-macro.S b/arch/arm/mach-h720x/include/mach/entry-macro.S index 38dd63ae104e..6d3b917c4a18 100644 --- a/include/asm-arm/arch-h720x/entry-macro.S +++ b/arch/arm/mach-h720x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-h720x/entry-macro.S + * arch/arm/mach-h720x/include/mach/entry-macro.S * * Low-level IRQ helper macros for Hynix HMS720x based platforms * diff --git a/include/asm-arm/arch-h720x/h7201-regs.h b/arch/arm/mach-h720x/include/mach/h7201-regs.h index 49d4f6bd3080..611b4947ccfc 100644 --- a/include/asm-arm/arch-h720x/h7201-regs.h +++ b/arch/arm/mach-h720x/include/mach/h7201-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/h7201-regs.h + * arch/arm/mach-h720x/include/mach/h7201-regs.h * * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. * (C) 2003 Thomas Gleixner <tglx@linutronix.de> diff --git a/include/asm-arm/arch-h720x/h7202-regs.h b/arch/arm/mach-h720x/include/mach/h7202-regs.h index 43d8ba8a6013..17c12eb34995 100644 --- a/include/asm-arm/arch-h720x/h7202-regs.h +++ b/arch/arm/mach-h720x/include/mach/h7202-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/h7202-regs.h + * arch/arm/mach-h720x/include/mach/h7202-regs.h * * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. * (C) 2003 Thomas Gleixner <tglx@linutronix.de> diff --git a/include/asm-arm/arch-h720x/hardware.h b/arch/arm/mach-h720x/include/mach/hardware.h index dfb778906a9f..6c19156e2a42 100644 --- a/include/asm-arm/arch-h720x/hardware.h +++ b/arch/arm/mach-h720x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/hardware.h + * arch/arm/mach-h720x/include/mach/hardware.h * * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. * (C) 2003 Thomas Gleixner <tglx@linutronix.de> diff --git a/include/asm-arm/arch-h720x/io.h b/arch/arm/mach-h720x/include/mach/io.h index 68814828c9a7..1dab74ce88c6 100644 --- a/include/asm-arm/arch-h720x/io.h +++ b/arch/arm/mach-h720x/include/mach/io.h @@ -1,12 +1,12 @@ /* - * linux/include/asm-arm/arch-h720x/io.h + * arch/arm/mach-h720x/include/mach/io.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * * Changelog: * * 09-19-2001 JJKIM - * Created from linux/include/asm-arm/arch-l7200/io.h + * Created from arch/arm/mach-l7200/include/mach/io.h * * 03-27-2003 Robert Schwebel <r.schwebel@pengutronix.de>: * re-unified header files for h720x @@ -14,7 +14,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-h720x/irqs.h b/arch/arm/mach-h720x/include/mach/irqs.h index 8244413988be..430a92b492f1 100644 --- a/include/asm-arm/arch-h720x/irqs.h +++ b/arch/arm/mach-h720x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/irqs.h + * arch/arm/mach-h720x/include/mach/irqs.h * * Copyright (C) 2000 Jungjun Kim * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de> diff --git a/include/asm-arm/arch-h720x/memory.h b/arch/arm/mach-h720x/include/mach/memory.h index 53e923dba76e..cb26f49cc4e1 100644 --- a/include/asm-arm/arch-h720x/memory.h +++ b/arch/arm/mach-h720x/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/memory.h + * arch/arm/mach-h720x/include/mach/memory.h * * Copyright (c) 2000 Jungjun Kim * diff --git a/include/asm-arm/arch-h720x/system.h b/arch/arm/mach-h720x/include/mach/system.h index ddba93760b42..e4a7c760d52a 100644 --- a/include/asm-arm/arch-h720x/system.h +++ b/arch/arm/mach-h720x/include/mach/system.h @@ -1,18 +1,18 @@ /* - * linux/include/asm-arm/arch-h720x/system.h + * arch/arm/mach-h720x/include/mach/system.h * * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * linux/include/asm-arm/arch-h720x/system.h + * arch/arm/mach-h720x/include/mach/system.h * */ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static void arch_idle(void) { diff --git a/include/asm-arm/arch-h720x/timex.h b/arch/arm/mach-h720x/include/mach/timex.h index 48a391c4080f..3f2f447ff36b 100644 --- a/include/asm-arm/arch-h720x/timex.h +++ b/arch/arm/mach-h720x/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/timex.h + * arch/arm/mach-h720x/include/mach/timex.h * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. * * This program is free software; you can redistribute it and/or modify diff --git a/include/asm-arm/arch-h720x/uncompress.h b/arch/arm/mach-h720x/include/mach/uncompress.h index 61584cd5f425..d6623234f61e 100644 --- a/include/asm-arm/arch-h720x/uncompress.h +++ b/arch/arm/mach-h720x/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/uncompress.h + * arch/arm/mach-h720x/include/mach/uncompress.h * * Copyright (C) 2001-2002 Jungjun Kim */ @@ -7,7 +7,7 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define LSR 0x14 #define TEMPTY 0x40 diff --git a/include/asm-arm/arch-h720x/vmalloc.h b/arch/arm/mach-h720x/include/mach/vmalloc.h index b4693cb821ef..ff1460d6841b 100644 --- a/include/asm-arm/arch-h720x/vmalloc.h +++ b/arch/arm/mach-h720x/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-h720x/vmalloc.h + * arch/arm/mach-h720x/include/mach/vmalloc.h */ #ifndef __ARCH_ARM_VMALLOC_H diff --git a/include/asm-arm/arch-imx/debug-macro.S b/arch/arm/mach-imx/include/mach/debug-macro.S index c611871643a2..87802bbfe633 100644 --- a/include/asm-arm/arch-imx/debug-macro.S +++ b/arch/arm/mach-imx/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-imx/debug-macro.S +/* arch/arm/mach-imx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-imx/dma.h b/arch/arm/mach-imx/include/mach/dma.h index 621ff2c730f2..621ff2c730f2 100644 --- a/include/asm-arm/arch-imx/dma.h +++ b/arch/arm/mach-imx/include/mach/dma.h diff --git a/include/asm-arm/arch-imx/entry-macro.S b/arch/arm/mach-imx/include/mach/entry-macro.S index 5dc0f307c1bb..e4db679f7766 100644 --- a/include/asm-arm/arch-imx/entry-macro.S +++ b/arch/arm/mach-imx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-imx/entry-macro.S + * arch/arm/mach-imx/include/mach/entry-macro.S * * Low-level IRQ helper macros for iMX-based 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> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h index 486023263f32..6e3d795f2264 100644 --- a/include/asm-arm/arch-imx/gpio.h +++ b/arch/arm/mach-imx/include/mach/gpio.h @@ -1,6 +1,6 @@ #ifndef _IMX_GPIO_H -#include <asm/arch/imx-regs.h> +#include <mach/imx-regs.h> #define IMX_GPIO_ALLOC_MODE_NORMAL 0 #define IMX_GPIO_ALLOC_MODE_NO_ALLOC 1 diff --git a/include/asm-arm/arch-imx/hardware.h b/arch/arm/mach-imx/include/mach/hardware.h index 6542ca5e8c33..c73e9e724c75 100644 --- a/include/asm-arm/arch-imx/hardware.h +++ b/arch/arm/mach-imx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/hardware.h + * arch/arm/mach-imx/include/mach/hardware.h * * Copyright (C) 1999 ARM Limited. * diff --git a/include/asm-arm/arch-imx/imx-dma.h b/arch/arm/mach-imx/include/mach/imx-dma.h index 44d89c35539a..44d89c35539a 100644 --- a/include/asm-arm/arch-imx/imx-dma.h +++ b/arch/arm/mach-imx/include/mach/imx-dma.h diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h index fb9de2733879..fb9de2733879 100644 --- a/include/asm-arm/arch-imx/imx-regs.h +++ b/arch/arm/mach-imx/include/mach/imx-regs.h diff --git a/include/asm-arm/arch-imx/imx-uart.h b/arch/arm/mach-imx/include/mach/imx-uart.h index d54eb1d48026..d54eb1d48026 100644 --- a/include/asm-arm/arch-imx/imx-uart.h +++ b/arch/arm/mach-imx/include/mach/imx-uart.h diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h index 3ed9ec8b9f00..3ed9ec8b9f00 100644 --- a/include/asm-arm/arch-imx/imxfb.h +++ b/arch/arm/mach-imx/include/mach/imxfb.h diff --git a/include/asm-arm/arch-imx/io.h b/arch/arm/mach-imx/include/mach/io.h index 1a1d9bb88631..c50c5fa6fb81 100644 --- a/include/asm-arm/arch-imx/io.h +++ b/arch/arm/mach-imx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/io.h + * arch/arm/mach-imxads/include/mach/io.h * * Copyright (C) 1999 ARM Limited * @@ -20,7 +20,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-imx/irqs.h b/arch/arm/mach-imx/include/mach/irqs.h index 238197cfb9d9..eb8d5bd05d56 100644 --- a/include/asm-arm/arch-imx/irqs.h +++ b/arch/arm/mach-imx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/irqs.h + * arch/arm/mach-imxads/include/mach/irqs.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. @@ -23,7 +23,7 @@ #define __ARM_IRQS_H__ /* Use the imx definitions */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * IMX Interrupt numbers diff --git a/include/asm-arm/arch-imx/memory.h b/arch/arm/mach-imx/include/mach/memory.h index 5ad90127915f..5c453063c0ed 100644 --- a/include/asm-arm/arch-imx/memory.h +++ b/arch/arm/mach-imx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/memory.h + * arch/arm/mach-imx/include/mach/memory.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2002 Shane Nay (shane@minirl.com) diff --git a/include/asm-arm/arch-imx/mmc.h b/arch/arm/mach-imx/include/mach/mmc.h index 4712f354dcca..4712f354dcca 100644 --- a/include/asm-arm/arch-imx/mmc.h +++ b/arch/arm/mach-imx/include/mach/mmc.h diff --git a/include/asm-arm/arch-imx/mx1ads.h b/arch/arm/mach-imx/include/mach/mx1ads.h index d90fa4b49ce1..def05d510eb3 100644 --- a/include/asm-arm/arch-imx/mx1ads.h +++ b/arch/arm/mach-imx/include/mach/mx1ads.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/mx1ads.h + * arch/arm/mach-imx/include/mach/mx1ads.h * * Copyright (C) 2004 Robert Schwebel, Pengutronix * diff --git a/include/asm-arm/arch-imx/spi_imx.h b/arch/arm/mach-imx/include/mach/spi_imx.h index 2165449e976e..4186430feecf 100644 --- a/include/asm-arm/arch-imx/spi_imx.h +++ b/arch/arm/mach-imx/include/mach/spi_imx.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-imx/spi_imx.h + * arch/arm/mach-imx/include/mach/spi_imx.h * * Copyright (C) 2006 SWAPP * Andrea Paterniani <a.paterniani@swapp-eng.it> * * Initial version inspired by: - * linux-2.6.17-rc3-mm1/include/asm-arm/arch-pxa/pxa2xx_spi.h + * linux-2.6.17-rc3-mm1/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/asm-arm/arch-imx/system.h b/arch/arm/mach-imx/include/mach/system.h index c645fe9afb9d..adee7e51bab2 100644 --- a/include/asm-arm/arch-imx/system.h +++ b/arch/arm/mach-imx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/system.h + * arch/arm/mach-imxads/include/mach/system.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd diff --git a/include/asm-arm/arch-imx/timex.h b/arch/arm/mach-imx/include/mach/timex.h index e22ba789546c..e22ba789546c 100644 --- a/include/asm-arm/arch-imx/timex.h +++ b/arch/arm/mach-imx/include/mach/timex.h diff --git a/include/asm-arm/arch-imx/uncompress.h b/arch/arm/mach-imx/include/mach/uncompress.h index da333f69136f..70523e67a8f6 100644 --- a/include/asm-arm/arch-imx/uncompress.h +++ b/arch/arm/mach-imx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/uncompress.h + * arch/arm/mach-imxads/include/mach/uncompress.h * * * diff --git a/include/asm-arm/arch-imx/vmalloc.h b/arch/arm/mach-imx/include/mach/vmalloc.h index cb6169127068..7d7cb0bde3e8 100644 --- a/include/asm-arm/arch-imx/vmalloc.h +++ b/arch/arm/mach-imx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/vmalloc.h + * arch/arm/mach-imx/include/mach/vmalloc.h * * Copyright (C) 2000 Russell King. * diff --git a/include/asm-arm/arch-integrator/bits.h b/arch/arm/mach-integrator/include/mach/bits.h index 09b024e0496a..09b024e0496a 100644 --- a/include/asm-arm/arch-integrator/bits.h +++ b/arch/arm/mach-integrator/include/mach/bits.h diff --git a/include/asm-arm/arch-integrator/cm.h b/arch/arm/mach-integrator/include/mach/cm.h index 1ab353e23595..1ab353e23595 100644 --- a/include/asm-arm/arch-integrator/cm.h +++ b/arch/arm/mach-integrator/include/mach/cm.h diff --git a/include/asm-arm/arch-integrator/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S index 85b327c352df..d347d659ea30 100644 --- a/include/asm-arm/arch-integrator/debug-macro.S +++ b/arch/arm/mach-integrator/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-integrator/debug-macro.S +/* arch/arm/mach-integrator/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-integrator/dma.h b/arch/arm/mach-integrator/include/mach/dma.h index 83fd6bbaf9d3..fbebe85a2db7 100644 --- a/include/asm-arm/arch-integrator/dma.h +++ b/arch/arm/mach-integrator/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/dma.h + * arch/arm/mach-integrator/include/mach/dma.h * * Copyright (C) 1997,1998 Russell King * diff --git a/include/asm-arm/arch-integrator/entry-macro.S b/arch/arm/mach-integrator/include/mach/entry-macro.S index ef535a68bdd3..7649c57acb53 100644 --- a/include/asm-arm/arch-integrator/entry-macro.S +++ b/arch/arm/mach-integrator/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-integrator/entry-macro.S + * arch/arm/mach-integrator/include/mach/entry-macro.S * * Low-level IRQ helper macros for Integrator 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-integrator/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h index 6f0947bc500d..1251319ef9ae 100644 --- a/include/asm-arm/arch-integrator/hardware.h +++ b/arch/arm/mach-integrator/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/hardware.h + * arch/arm/mach-integrator/include/mach/hardware.h * * This file contains the hardware definitions of the Integrator. * @@ -23,7 +23,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * Where in virtual memory the IO devices (timers, system controllers diff --git a/include/asm-arm/arch-integrator/impd1.h b/arch/arm/mach-integrator/include/mach/impd1.h index d75de4b14237..d75de4b14237 100644 --- a/include/asm-arm/arch-integrator/impd1.h +++ b/arch/arm/mach-integrator/include/mach/impd1.h diff --git a/include/asm-arm/arch-integrator/io.h b/arch/arm/mach-integrator/include/mach/io.h index c8f2175948bd..f21bb5493dd9 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/arch/arm/mach-integrator/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/io.h + * arch/arm/mach-integrator/include/mach/io.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/irqs.h b/arch/arm/mach-integrator/include/mach/irqs.h index ba7b3afee445..1fbe6d190222 100644 --- a/include/asm-arm/arch-integrator/irqs.h +++ b/arch/arm/mach-integrator/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/irqs.h + * arch/arm/mach-integrator/include/mach/irqs.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. diff --git a/include/asm-arm/arch-integrator/lm.h b/arch/arm/mach-integrator/include/mach/lm.h index 28186b6f2c09..28186b6f2c09 100644 --- a/include/asm-arm/arch-integrator/lm.h +++ b/arch/arm/mach-integrator/include/mach/lm.h diff --git a/include/asm-arm/arch-integrator/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index 1ab56d783e7c..be7e63c21d25 100644 --- a/include/asm-arm/arch-integrator/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/memory.h + * arch/arm/mach-integrator/include/mach/memory.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 83c4c1ceb411..83c4c1ceb411 100644 --- a/include/asm-arm/arch-integrator/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h diff --git a/include/asm-arm/arch-integrator/system.h b/arch/arm/mach-integrator/include/mach/system.h index 8ea442237d20..c485345c8c77 100644 --- a/include/asm-arm/arch-integrator/system.h +++ b/arch/arm/mach-integrator/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/system.h + * arch/arm/mach-integrator/include/mach/system.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/cm.h> +#include <mach/cm.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-integrator/timex.h b/arch/arm/mach-integrator/include/mach/timex.h index 87a762818ba2..1dcb42028c82 100644 --- a/include/asm-arm/arch-integrator/timex.h +++ b/arch/arm/mach-integrator/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/timex.h + * arch/arm/mach-integrator/include/mach/timex.h * * Integrator architecture timex specifications * diff --git a/include/asm-arm/arch-integrator/uncompress.h b/arch/arm/mach-integrator/include/mach/uncompress.h index f61825c4d901..30452f00a164 100644 --- a/include/asm-arm/arch-integrator/uncompress.h +++ b/arch/arm/mach-integrator/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/uncompress.h + * arch/arm/mach-integrator/include/mach/uncompress.h * * Copyright (C) 1999 ARM Limited * diff --git a/include/asm-arm/arch-integrator/vmalloc.h b/arch/arm/mach-integrator/include/mach/vmalloc.h index 170cccece523..e87ab0b37bdd 100644 --- a/include/asm-arm/arch-integrator/vmalloc.h +++ b/arch/arm/mach-integrator/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-integrator/vmalloc.h + * arch/arm/mach-integrator/include/mach/vmalloc.h * * Copyright (C) 2000 Russell King. * diff --git a/include/asm-arm/arch-iop13xx/adma.h b/arch/arm/mach-iop13xx/include/mach/adma.h index 26f60af67168..60019c8e6465 100644 --- a/include/asm-arm/arch-iop13xx/adma.h +++ b/arch/arm/mach-iop13xx/include/mach/adma.h @@ -19,7 +19,7 @@ #define _ADMA_H #include <linux/types.h> #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iop_adma.h> #define ADMA_ACCR(chan) (chan->mmr_base + 0x0) diff --git a/include/asm-arm/arch-iop13xx/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S index 788b4e386c16..9037d2e8557c 100644 --- a/include/asm-arm/arch-iop13xx/debug-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop13xx/debug-macro.S + * arch/arm/mach-iop13xx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop13xx/dma.h b/arch/arm/mach-iop13xx/include/mach/dma.h index d79846fbb394..d79846fbb394 100644 --- a/include/asm-arm/arch-iop13xx/dma.h +++ b/arch/arm/mach-iop13xx/include/mach/dma.h diff --git a/include/asm-arm/arch-iop13xx/entry-macro.S b/arch/arm/mach-iop13xx/include/mach/entry-macro.S index a624a7870c64..a624a7870c64 100644 --- a/include/asm-arm/arch-iop13xx/entry-macro.S +++ b/arch/arm/mach-iop13xx/include/mach/entry-macro.S diff --git a/include/asm-arm/arch-iop13xx/hardware.h b/arch/arm/mach-iop13xx/include/mach/hardware.h index 8e1d56289846..8e1d56289846 100644 --- a/include/asm-arm/arch-iop13xx/hardware.h +++ b/arch/arm/mach-iop13xx/include/mach/hardware.h diff --git a/include/asm-arm/arch-iop13xx/io.h b/arch/arm/mach-iop13xx/include/mach/io.h index a6e0f9e6ddcf..a6e0f9e6ddcf 100644 --- a/include/asm-arm/arch-iop13xx/io.h +++ b/arch/arm/mach-iop13xx/include/mach/io.h diff --git a/include/asm-arm/arch-iop13xx/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h index 52b7fab7ef60..52b7fab7ef60 100644 --- a/include/asm-arm/arch-iop13xx/iop13xx.h +++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h diff --git a/include/asm-arm/arch-iop13xx/iq81340.h b/arch/arm/mach-iop13xx/include/mach/iq81340.h index ba2cf931e9ce..ba2cf931e9ce 100644 --- a/include/asm-arm/arch-iop13xx/iq81340.h +++ b/arch/arm/mach-iop13xx/include/mach/iq81340.h diff --git a/include/asm-arm/arch-iop13xx/irqs.h b/arch/arm/mach-iop13xx/include/mach/irqs.h index 054e7acb5bfa..054e7acb5bfa 100644 --- a/include/asm-arm/arch-iop13xx/irqs.h +++ b/arch/arm/mach-iop13xx/include/mach/irqs.h diff --git a/include/asm-arm/arch-iop13xx/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index 031a0fa78eff..e8b59d8f1bb9 100644 --- a/include/asm-arm/arch-iop13xx/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-iop13xx/msi.h b/arch/arm/mach-iop13xx/include/mach/msi.h index b80c5ae17e99..b80c5ae17e99 100644 --- a/include/asm-arm/arch-iop13xx/msi.h +++ b/arch/arm/mach-iop13xx/include/mach/msi.h diff --git a/include/asm-arm/arch-iop13xx/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h index 4041f30d4cd3..17b5515af8b1 100644 --- a/include/asm-arm/arch-iop13xx/pci.h +++ b/arch/arm/mach-iop13xx/include/mach/pci.h @@ -1,6 +1,6 @@ #ifndef _IOP13XX_PCI_H_ #define _IOP13XX_PCI_H_ -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include <asm/io.h> struct pci_sys_data; diff --git a/include/asm-arm/arch-iop13xx/system.h b/arch/arm/mach-iop13xx/include/mach/system.h index 8575af8db78c..c7127f416e1f 100644 --- a/include/asm-arm/arch-iop13xx/system.h +++ b/arch/arm/mach-iop13xx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-iop13xx/system.h + * arch/arm/mach-iop13xx/include/mach/system.h * * Copyright (C) 2004 Intel Corp. * @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/iop13xx.h> +#include <mach/iop13xx.h> static inline void arch_idle(void) { cpu_do_idle(); diff --git a/include/asm-arm/arch-iop13xx/time.h b/arch/arm/mach-iop13xx/include/mach/time.h index 49213d9d7cad..49213d9d7cad 100644 --- a/include/asm-arm/arch-iop13xx/time.h +++ b/arch/arm/mach-iop13xx/include/mach/time.h diff --git a/include/asm-arm/arch-iop13xx/timex.h b/arch/arm/mach-iop13xx/include/mach/timex.h index 47564ecb3872..5b1f1c8a8270 100644 --- a/include/asm-arm/arch-iop13xx/timex.h +++ b/arch/arm/mach-iop13xx/include/mach/timex.h @@ -1,3 +1,3 @@ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define CLOCK_TICK_RATE (100 * HZ) diff --git a/include/asm-arm/arch-iop13xx/uncompress.h b/arch/arm/mach-iop13xx/include/mach/uncompress.h index 5d4418decb86..fa4f80522fad 100644 --- a/include/asm-arm/arch-iop13xx/uncompress.h +++ b/arch/arm/mach-iop13xx/include/mach/uncompress.h @@ -1,6 +1,6 @@ #include <asm/types.h> #include <linux/serial_reg.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) diff --git a/include/asm-arm/arch-iop13xx/vmalloc.h b/arch/arm/mach-iop13xx/include/mach/vmalloc.h index c53456740345..c53456740345 100644 --- a/include/asm-arm/arch-iop13xx/vmalloc.h +++ b/arch/arm/mach-iop13xx/include/mach/vmalloc.h diff --git a/include/asm-arm/arch-iop32x/adma.h b/arch/arm/mach-iop32x/include/mach/adma.h index 5ed92037dd10..5ed92037dd10 100644 --- a/include/asm-arm/arch-iop32x/adma.h +++ b/arch/arm/mach-iop32x/include/mach/adma.h diff --git a/include/asm-arm/arch-iop32x/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S index 9022b6849e23..58b01664ffba 100644 --- a/include/asm-arm/arch-iop32x/debug-macro.S +++ b/arch/arm/mach-iop32x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/debug-macro.S + * arch/arm/mach-iop32x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop33x/dma.h b/arch/arm/mach-iop32x/include/mach/dma.h index b7775fdc5ad3..f8bd817f205d 100644 --- a/include/asm-arm/arch-iop33x/dma.h +++ b/arch/arm/mach-iop32x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/dma.h + * arch/arm/mach-iop32x/include/mach/dma.h * * Copyright (C) 2004 Intel Corp. * diff --git a/include/asm-arm/arch-iop32x/entry-macro.S b/arch/arm/mach-iop32x/include/mach/entry-macro.S index 207db99dfbd2..b02fb56bafcc 100644 --- a/include/asm-arm/arch-iop32x/entry-macro.S +++ b/arch/arm/mach-iop32x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/entry-macro.S + * arch/arm/mach-iop32x/include/mach/entry-macro.S * * Low-level IRQ helper macros for IOP32x-based 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/iop32x.h> +#include <mach/iop32x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-iop32x/glantank.h b/arch/arm/mach-iop32x/include/mach/glantank.h index bf0665acc1c1..958eb91c0913 100644 --- a/include/asm-arm/arch-iop32x/glantank.h +++ b/arch/arm/mach-iop32x/include/mach/glantank.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/glantank.h + * arch/arm/mach-iop32x/include/mach/glantank.h * * IO-Data GLAN Tank board registers */ diff --git a/include/asm-arm/arch-iop32x/gpio.h b/arch/arm/mach-iop32x/include/mach/gpio.h index 708f4ec9db1d..708f4ec9db1d 100644 --- a/include/asm-arm/arch-iop32x/gpio.h +++ b/arch/arm/mach-iop32x/include/mach/gpio.h diff --git a/include/asm-arm/arch-iop32x/hardware.h b/arch/arm/mach-iop32x/include/mach/hardware.h index 6556ed5eee31..d559c4e6095a 100644 --- a/include/asm-arm/arch-iop32x/hardware.h +++ b/arch/arm/mach-iop32x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/hardware.h + * arch/arm/mach-iop32x/include/mach/hardware.h */ #ifndef __HARDWARE_H diff --git a/include/asm-arm/arch-iop32x/io.h b/arch/arm/mach-iop32x/include/mach/io.h index 47b2736236e4..ce54705ba3d4 100644 --- a/include/asm-arm/arch-iop32x/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/io.h + * arch/arm/mach-iop32x/include/mach/io.h * * Copyright (C) 2001 MontaVista Software, Inc. * @@ -11,7 +11,7 @@ #ifndef __IO_H #define __IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, unsigned int mtype); diff --git a/include/asm-arm/arch-iop32x/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h index 0d8af57221a1..abd9eb49f103 100644 --- a/include/asm-arm/arch-iop32x/iop32x.h +++ b/arch/arm/mach-iop32x/include/mach/iop32x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iop32x.h + * arch/arm/mach-iop32x/include/mach/iop32x.h * * Intel IOP32X Chip definitions * diff --git a/include/asm-arm/arch-iop32x/iq31244.h b/arch/arm/mach-iop32x/include/mach/iq31244.h index fff4eafa1f6b..6b6b369e781c 100644 --- a/include/asm-arm/arch-iop32x/iq31244.h +++ b/arch/arm/mach-iop32x/include/mach/iq31244.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iq31244.h + * arch/arm/mach-iop32x/include/mach/iq31244.h * * Intel IQ31244 evaluation board registers */ diff --git a/include/asm-arm/arch-iop32x/iq80321.h b/arch/arm/mach-iop32x/include/mach/iq80321.h index eb69db9b9a06..498819b737e7 100644 --- a/include/asm-arm/arch-iop32x/iq80321.h +++ b/arch/arm/mach-iop32x/include/mach/iq80321.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/iq80321.h + * arch/arm/mach-iop32x/include/mach/iq80321.h * * Intel IQ80321 evaluation board registers */ diff --git a/include/asm-arm/arch-iop32x/irqs.h b/arch/arm/mach-iop32x/include/mach/irqs.h index bbaef873afce..33573e09914c 100644 --- a/include/asm-arm/arch-iop32x/irqs.h +++ b/arch/arm/mach-iop32x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/irqs.h + * arch/arm/mach-iop32x/include/mach/irqs.h * * Author: Rory Bolt <rorybolt@pacbell.net> * Copyright: (C) 2002 Rory Bolt diff --git a/include/asm-arm/arch-iop32x/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h index bdcf03895ee0..42cd4bf3148c 100644 --- a/include/asm-arm/arch-iop32x/memory.h +++ b/arch/arm/mach-iop32x/include/mach/memory.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop32x/memory.h + * arch/arm/mach-iop32x/include/mach/memory.h */ #ifndef __MEMORY_H #define __MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-iop32x/n2100.h b/arch/arm/mach-iop32x/include/mach/n2100.h index 77a8af476629..40b8a532b064 100644 --- a/include/asm-arm/arch-iop32x/n2100.h +++ b/arch/arm/mach-iop32x/include/mach/n2100.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/n2100.h + * arch/arm/mach-iop32x/include/mach/n2100.h * * Thecus N2100 board registers */ diff --git a/include/asm-arm/arch-iop32x/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 17b7eb7e9c0d..20f923e54f46 100644 --- a/include/asm-arm/arch-iop32x/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/system.h + * arch/arm/mach-iop32x/include/mach/system.h * * Copyright (C) 2001 MontaVista Software, Inc. * diff --git a/include/asm-arm/arch-iop32x/time.h b/arch/arm/mach-iop32x/include/mach/time.h index 0f28c9949623..0f28c9949623 100644 --- a/include/asm-arm/arch-iop32x/time.h +++ b/arch/arm/mach-iop32x/include/mach/time.h diff --git a/include/asm-arm/arch-iop32x/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h index 445704619825..a541afced3cb 100644 --- a/include/asm-arm/arch-iop32x/timex.h +++ b/arch/arm/mach-iop32x/include/mach/timex.h @@ -1,9 +1,9 @@ /* - * include/asm-arm/arch-iop32x/timex.h + * arch/arm/mach-iop32x/include/mach/timex.h * * IOP32x architecture timex specifications */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define CLOCK_TICK_RATE (100 * HZ) diff --git a/include/asm-arm/arch-iop32x/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index 07028786394e..b247551b6f5a 100644 --- a/include/asm-arm/arch-iop32x/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop32x/uncompress.h + * arch/arm/mach-iop32x/include/mach/uncompress.h */ #include <asm/types.h> #include <asm/mach-types.h> #include <linux/serial_reg.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static volatile u8 *uart_base; diff --git a/include/asm-arm/arch-iop33x/adma.h b/arch/arm/mach-iop33x/include/mach/adma.h index 4b92f795f90e..4b92f795f90e 100644 --- a/include/asm-arm/arch-iop33x/adma.h +++ b/arch/arm/mach-iop33x/include/mach/adma.h diff --git a/include/asm-arm/arch-iop33x/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S index 9e7132ebe6a7..a60c9ef05cc3 100644 --- a/include/asm-arm/arch-iop33x/debug-macro.S +++ b/arch/arm/mach-iop33x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/debug-macro.S + * arch/arm/mach-iop33x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-iop32x/dma.h b/arch/arm/mach-iop33x/include/mach/dma.h index e977a9ef3160..d8b42232931d 100644 --- a/include/asm-arm/arch-iop32x/dma.h +++ b/arch/arm/mach-iop33x/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop32x/dma.h + * arch/arm/mach-iop33x/include/mach/dma.h * * Copyright (C) 2004 Intel Corp. * diff --git a/include/asm-arm/arch-iop33x/entry-macro.S b/arch/arm/mach-iop33x/include/mach/entry-macro.S index b8e3d449e882..4e1f7282b354 100644 --- a/include/asm-arm/arch-iop33x/entry-macro.S +++ b/arch/arm/mach-iop33x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/entry-macro.S + * arch/arm/mach-iop33x/include/mach/entry-macro.S * * Low-level IRQ helper macros for IOP33x-based 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/iop33x.h> +#include <mach/iop33x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-iop33x/gpio.h b/arch/arm/mach-iop33x/include/mach/gpio.h index ddd55bba9bb9..ddd55bba9bb9 100644 --- a/include/asm-arm/arch-iop33x/gpio.h +++ b/arch/arm/mach-iop33x/include/mach/gpio.h diff --git a/include/asm-arm/arch-iop33x/hardware.h b/arch/arm/mach-iop33x/include/mach/hardware.h index 0659cf94d040..8c10e430655e 100644 --- a/include/asm-arm/arch-iop33x/hardware.h +++ b/arch/arm/mach-iop33x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/hardware.h + * arch/arm/mach-iop33x/include/mach/hardware.h */ #ifndef __HARDWARE_H diff --git a/include/asm-arm/arch-iop33x/io.h b/arch/arm/mach-iop33x/include/mach/io.h index 3fc607c46f03..158874631217 100644 --- a/include/asm-arm/arch-iop33x/io.h +++ b/arch/arm/mach-iop33x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/io.h + * arch/arm/mach-iop33x/include/mach/io.h * * Copyright (C) 2001 MontaVista Software, Inc. * @@ -11,7 +11,7 @@ #ifndef __IO_H #define __IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, unsigned int mtype); diff --git a/include/asm-arm/arch-iop33x/iop33x.h b/arch/arm/mach-iop33x/include/mach/iop33x.h index 766985b9a723..24567316ec88 100644 --- a/include/asm-arm/arch-iop33x/iop33x.h +++ b/arch/arm/mach-iop33x/include/mach/iop33x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iop33x.h + * arch/arm/mach-iop33x/include/mach/iop33x.h * * Intel IOP33X Chip definitions * diff --git a/include/asm-arm/arch-iop33x/iq80331.h b/arch/arm/mach-iop33x/include/mach/iq80331.h index 79b9302017ea..fe406b0127f7 100644 --- a/include/asm-arm/arch-iop33x/iq80331.h +++ b/arch/arm/mach-iop33x/include/mach/iq80331.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iq80331.h + * arch/arm/mach-iop33x/include/mach/iq80331.h * * Intel IQ80331 evaluation board registers */ diff --git a/include/asm-arm/arch-iop33x/iq80332.h b/arch/arm/mach-iop33x/include/mach/iq80332.h index 053165629492..8325d71f2ed5 100644 --- a/include/asm-arm/arch-iop33x/iq80332.h +++ b/arch/arm/mach-iop33x/include/mach/iq80332.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/iq80332.h + * arch/arm/mach-iop33x/include/mach/iq80332.h * * Intel IQ80332 evaluation board registers */ diff --git a/include/asm-arm/arch-iop33x/irqs.h b/arch/arm/mach-iop33x/include/mach/irqs.h index d045f8403396..707628a600ac 100644 --- a/include/asm-arm/arch-iop33x/irqs.h +++ b/arch/arm/mach-iop33x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/irqs.h + * arch/arm/mach-iop33x/include/mach/irqs.h * * Author: Dave Jiang (dave.jiang@intel.com) * Copyright: (C) 2003 Intel Corp. diff --git a/include/asm-arm/arch-iop33x/memory.h b/arch/arm/mach-iop33x/include/mach/memory.h index d798d83c83a5..2cef0bbb354f 100644 --- a/include/asm-arm/arch-iop33x/memory.h +++ b/arch/arm/mach-iop33x/include/mach/memory.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop33x/memory.h + * arch/arm/mach-iop33x/include/mach/memory.h */ #ifndef __MEMORY_H #define __MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-iop33x/system.h b/arch/arm/mach-iop33x/include/mach/system.h index 00dd07ece262..7bf3bfb49446 100644 --- a/include/asm-arm/arch-iop33x/system.h +++ b/arch/arm/mach-iop33x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-iop33x/system.h + * arch/arm/mach-iop33x/include/mach/system.h * * Copyright (C) 2001 MontaVista Software, Inc. * diff --git a/include/asm-arm/arch-iop33x/time.h b/arch/arm/mach-iop33x/include/mach/time.h index 4ac4d7664f85..4ac4d7664f85 100644 --- a/include/asm-arm/arch-iop33x/time.h +++ b/arch/arm/mach-iop33x/include/mach/time.h diff --git a/include/asm-arm/arch-iop33x/timex.h b/arch/arm/mach-iop33x/include/mach/timex.h index 75a001e93daf..c75760844d49 100644 --- a/include/asm-arm/arch-iop33x/timex.h +++ b/arch/arm/mach-iop33x/include/mach/timex.h @@ -1,9 +1,9 @@ /* - * include/asm-arm/arch-iop33x/timex.h + * arch/arm/mach-iop33x/include/mach/timex.h * * IOP3xx architecture timex specifications */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define CLOCK_TICK_RATE (100 * HZ) diff --git a/include/asm-arm/arch-iop33x/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h index 34d9e8e8287a..b42423f63302 100644 --- a/include/asm-arm/arch-iop33x/uncompress.h +++ b/arch/arm/mach-iop33x/include/mach/uncompress.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-iop33x/uncompress.h + * arch/arm/mach-iop33x/include/mach/uncompress.h */ #include <asm/types.h> #include <asm/mach-types.h> #include <linux/serial_reg.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static volatile u32 *uart_base; diff --git a/include/asm-arm/arch-ixp2000/debug-macro.S b/arch/arm/mach-ixp2000/include/mach/debug-macro.S index bc8b39654793..904ff56d2246 100644 --- a/include/asm-arm/arch-ixp2000/debug-macro.S +++ b/arch/arm/mach-ixp2000/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-ixp2000/debug-macro.S +/* arch/arm/mach-ixp2000/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-ixp2000/dma.h b/arch/arm/mach-ixp2000/include/mach/dma.h index 548d8dc507eb..26063d60f622 100644 --- a/include/asm-arm/arch-ixp2000/dma.h +++ b/arch/arm/mach-ixp2000/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/dma.h + * arch/arm/mach-ixp2000/include/mach/dma.h * * Copyright (C) 2002 Intel Corp. * diff --git a/include/asm-arm/arch-ixp2000/enp2611.h b/arch/arm/mach-ixp2000/include/mach/enp2611.h index 42f3c28dc5c4..9ce3690061d5 100644 --- a/include/asm-arm/arch-ixp2000/enp2611.h +++ b/arch/arm/mach-ixp2000/include/mach/enp2611.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/enp2611.h + * arch/arm/mach-ixp2000/include/mach/enp2611.h * * Register and other defines for Radisys ENP-2611 * diff --git a/include/asm-arm/arch-ixp2000/entry-macro.S b/arch/arm/mach-ixp2000/include/mach/entry-macro.S index 11d512ad5945..5850ffc8c751 100644 --- a/include/asm-arm/arch-ixp2000/entry-macro.S +++ b/arch/arm/mach-ixp2000/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/entry-macro.S + * arch/arm/mach-ixp2000/include/mach/entry-macro.S * * Low-level IRQ helper macros for IXP2000-based 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/irqs.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ixp2000/gpio.h b/arch/arm/mach-ixp2000/include/mach/gpio.h index 03cbbe1fd9d8..4a88d2c33dac 100644 --- a/include/asm-arm/arch-ixp2000/gpio.h +++ b/arch/arm/mach-ixp2000/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/gpio.h + * arch/arm/mach-ixp2000/include/mach/gpio.h * * Copyright (C) 2002 Intel Corporation. * diff --git a/include/asm-arm/arch-ixp2000/hardware.h b/arch/arm/mach-ixp2000/include/mach/hardware.h index e7ea781c48aa..f033de4e7493 100644 --- a/include/asm-arm/arch-ixp2000/hardware.h +++ b/arch/arm/mach-ixp2000/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/hardware.h + * arch/arm/mach-ixp2000/include/mach/hardware.h * * Hardware definitions for IXP2400/2800 based systems * diff --git a/include/asm-arm/arch-ixp2000/io.h b/arch/arm/mach-ixp2000/include/mach/io.h index 5dc1d25dcb4f..859e584914d9 100644 --- a/include/asm-arm/arch-ixp2000/io.h +++ b/arch/arm/mach-ixp2000/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/io.h + * arch/arm/mach-ixp2000/include/mach/io.h * * Original Author: Naeem M Afzal <naeem.m.afzal@intel.com> * Maintainer: Deepak Saxena <dsaxena@plexity.net> @@ -15,7 +15,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 #define __mem_pci(a) (a) diff --git a/include/asm-arm/arch-ixp2000/irqs.h b/arch/arm/mach-ixp2000/include/mach/irqs.h index 62f09c7ff420..bee96bcafdca 100644 --- a/include/asm-arm/arch-ixp2000/irqs.h +++ b/arch/arm/mach-ixp2000/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/irqs.h + * arch/arm/mach-ixp2000/include/mach/irqs.h * * Original Author: Naeem Afzal <naeem.m.afzal@intel.com> * Maintainer: Deepak Saxena <dsaxena@plexity.net> diff --git a/include/asm-arm/arch-ixp2000/ixdp2x00.h b/arch/arm/mach-ixp2000/include/mach/ixdp2x00.h index 546e2e8e27b8..5df8479d9481 100644 --- a/include/asm-arm/arch-ixp2000/ixdp2x00.h +++ b/arch/arm/mach-ixp2000/include/mach/ixdp2x00.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/ixdp2x00.h + * arch/arm/mach-ixp2000/include/mach/ixdp2x00.h * * Register and other defines for IXDP2[48]00 platforms * diff --git a/include/asm-arm/arch-ixp2000/ixdp2x01.h b/arch/arm/mach-ixp2000/include/mach/ixdp2x01.h index c6d51426e98f..4c1f04083e54 100644 --- a/include/asm-arm/arch-ixp2000/ixdp2x01.h +++ b/arch/arm/mach-ixp2000/include/mach/ixdp2x01.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/ixdp2x01.h + * arch/arm/mach-ixp2000/include/mach/ixdp2x01.h * * Platform definitions for IXDP2X01 && IXDP2801 systems * diff --git a/include/asm-arm/arch-ixp2000/ixp2000-regs.h b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h index ccae4bec92c5..19d80379a3e3 100644 --- a/include/asm-arm/arch-ixp2000/ixp2000-regs.h +++ b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/ixp2000-regs.h + * arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h * * Chipset register definitions for IXP2400/2800 based systems. * diff --git a/include/asm-arm/arch-ixp2000/memory.h b/arch/arm/mach-ixp2000/include/mach/memory.h index 21e1de51e3f6..241529a7c52d 100644 --- a/include/asm-arm/arch-ixp2000/memory.h +++ b/arch/arm/mach-ixp2000/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/memory.h + * arch/arm/mach-ixp2000/include/mach/memory.h * * Copyright (c) 2002 Intel Corp. * Copyright (c) 2003-2004 MontaVista Software, Inc. @@ -22,7 +22,7 @@ * bus_to_virt: Used to convert an address for DMA operations * to an address that the kernel can use. */ -#include <asm/arch/ixp2000-regs.h> +#include <mach/ixp2000-regs.h> #define __virt_to_bus(v) \ (((__virt_to_phys(v) - 0x0) + (*IXP2000_PCI_SDRAM_BAR & 0xfffffff0))) diff --git a/include/asm-arm/arch-ixp2000/platform.h b/arch/arm/mach-ixp2000/include/mach/platform.h index a66317ab2071..42182c79ed90 100644 --- a/include/asm-arm/arch-ixp2000/platform.h +++ b/arch/arm/mach-ixp2000/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp2000/platform.h + * arch/arm/mach-ixp2000/include/mach/platform.h * * Various bits of code used by platform-level code. * diff --git a/include/asm-arm/arch-ixp2000/system.h b/arch/arm/mach-ixp2000/include/mach/system.h index 8731dd36e452..2e9c68f95a24 100644 --- a/include/asm-arm/arch-ixp2000/system.h +++ b/arch/arm/mach-ixp2000/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/system.h + * arch/arm/mach-ixp2000/include/mach/system.h * * Copyright (C) 2002 Intel Corp. * Copyricht (C) 2003-2005 MontaVista Software, Inc. @@ -9,7 +9,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> static inline void arch_idle(void) diff --git a/include/asm-arm/arch-ixp2000/timex.h b/arch/arm/mach-ixp2000/include/mach/timex.h index b78a183d4698..835e659f93d4 100644 --- a/include/asm-arm/arch-ixp2000/timex.h +++ b/arch/arm/mach-ixp2000/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/timex.h + * arch/arm/mach-ixp2000/include/mach/timex.h * * IXP2000 architecture timex specifications */ diff --git a/include/asm-arm/arch-ixp2000/uncompress.h b/arch/arm/mach-ixp2000/include/mach/uncompress.h index f66b408f363e..ce363087df78 100644 --- a/include/asm-arm/arch-ixp2000/uncompress.h +++ b/arch/arm/mach-ixp2000/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/uncompress.h + * arch/arm/mach-ixp2000/include/mach/uncompress.h * * * Original Author: Naeem Afzal <naeem.m.afzal@intel.com> diff --git a/include/asm-arm/arch-ixp2000/vmalloc.h b/arch/arm/mach-ixp2000/include/mach/vmalloc.h index 275136963a0c..d195e35aed3b 100644 --- a/include/asm-arm/arch-ixp2000/vmalloc.h +++ b/arch/arm/mach-ixp2000/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp2000/vmalloc.h + * arch/arm/mach-ixp2000/include/mach/vmalloc.h * * Author: Naeem Afzal <naeem.m.afzal@intel.com> * diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S index 2b25e640247d..905db3188724 100644 --- a/include/asm-arm/arch-ixp23xx/debug-macro.S +++ b/arch/arm/mach-ixp23xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/debug-macro.S + * arch/arm/mach-ixp23xx/include/mach/debug-macro.S * * Debugging macro include header * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/ixp23xx.h> +#include <mach/ixp23xx.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-ixp23xx/entry-macro.S b/arch/arm/mach-ixp23xx/include/mach/entry-macro.S index ec9dd6fc2d0f..3f5338a7bbdd 100644 --- a/include/asm-arm/arch-ixp23xx/entry-macro.S +++ b/arch/arm/mach-ixp23xx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/entry-macro.S + * arch/arm/mach-ixp23xx/include/mach/entry-macro.S */ .macro disable_fiq diff --git a/include/asm-arm/arch-ixp23xx/hardware.h b/arch/arm/mach-ixp23xx/include/mach/hardware.h index c0010d21a684..c3192009a886 100644 --- a/include/asm-arm/arch-ixp23xx/hardware.h +++ b/arch/arm/mach-ixp23xx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/hardware.h + * arch/arm/mach-ixp23xx/include/mach/hardware.h * * Copyright (C) 2002-2004 Intel Corporation. * Copyricht (C) 2005 MontaVista Software, Inc. diff --git a/include/asm-arm/arch-ixp23xx/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h index 66f5bafc315c..305ea1808c71 100644 --- a/include/asm-arm/arch-ixp23xx/io.h +++ b/arch/arm/mach-ixp23xx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/io.h + * arch/arm/mach-ixp23xx/include/mach/io.h * * Original Author: Naeem M Afzal <naeem.m.afzal@intel.com> * Maintainer: Deepak Saxena <dsaxena@plexity.net> diff --git a/include/asm-arm/arch-ixp23xx/irqs.h b/arch/arm/mach-ixp23xx/include/mach/irqs.h index 27c580898958..3af33a04b8a2 100644 --- a/include/asm-arm/arch-ixp23xx/irqs.h +++ b/arch/arm/mach-ixp23xx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/irqs.h + * arch/arm/mach-ixp23xx/include/mach/irqs.h * * IRQ definitions for IXP23XX based systems * diff --git a/include/asm-arm/arch-ixp23xx/ixdp2351.h b/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h index d5e8a43d7bbd..663951027de5 100644 --- a/include/asm-arm/arch-ixp23xx/ixdp2351.h +++ b/arch/arm/mach-ixp23xx/include/mach/ixdp2351.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/ixdp2351.h + * arch/arm/mach-ixp23xx/include/mach/ixdp2351.h * * Register and other defines for IXDP2351 * diff --git a/include/asm-arm/arch-ixp23xx/ixp23xx.h b/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h index 3927b1d61b17..6d02481b1d6d 100644 --- a/include/asm-arm/arch-ixp23xx/ixp23xx.h +++ b/arch/arm/mach-ixp23xx/include/mach/ixp23xx.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/ixp23xx.h + * arch/arm/mach-ixp23xx/include/mach/ixp23xx.h * * Register definitions for IXP23XX * diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/arch/arm/mach-ixp23xx/include/mach/memory.h index c3d906af9fea..9d40115f7ebe 100644 --- a/include/asm-arm/arch-ixp23xx/memory.h +++ b/arch/arm/mach-ixp23xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/memory.h + * arch/arm/mach-ixp23xx/include/mach/memory.h * * Copyright (c) 2003-2004 Intel Corp. * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical DRAM offset. diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/arch/arm/mach-ixp23xx/include/mach/platform.h index db8aa304c93d..db9d9416e5e4 100644 --- a/include/asm-arm/arch-ixp23xx/platform.h +++ b/arch/arm/mach-ixp23xx/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/platform.h + * arch/arm/mach-ixp23xx/include/mach/platform.h * * Various bits of code used by platform-level code. * diff --git a/include/asm-arm/arch-ixp23xx/system.h b/arch/arm/mach-ixp23xx/include/mach/system.h index 54e8a51475e6..d57c3fc10f1f 100644 --- a/include/asm-arm/arch-ixp23xx/system.h +++ b/arch/arm/mach-ixp23xx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/system.h + * arch/arm/mach-ixp23xx/include/mach/system.h * * Copyright (C) 2003 Intel Corporation. * @@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> static inline void arch_idle(void) diff --git a/include/asm-arm/arch-ixp23xx/timex.h b/arch/arm/mach-ixp23xx/include/mach/timex.h index 516f72fe6082..e341e9cf9c37 100644 --- a/include/asm-arm/arch-ixp23xx/timex.h +++ b/arch/arm/mach-ixp23xx/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/timex.h + * arch/arm/mach-ixp23xx/include/mach/timex.h * * XScale architecture timex specifications */ diff --git a/include/asm-arm/arch-ixp23xx/uncompress.h b/arch/arm/mach-ixp23xx/include/mach/uncompress.h index 16c1110f2304..8b4c358d2c04 100644 --- a/include/asm-arm/arch-ixp23xx/uncompress.h +++ b/arch/arm/mach-ixp23xx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/uncompress.h + * arch/arm/mach-ixp23xx/include/mach/uncompress.h * * Copyright (C) 2002-2004 Intel Corporation. * @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/arch/ixp23xx.h> +#include <mach/ixp23xx.h> #include <linux/serial_reg.h> #define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS) diff --git a/include/asm-arm/arch-ixp23xx/vmalloc.h b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h index 9f2566658541..dd519f678d10 100644 --- a/include/asm-arm/arch-ixp23xx/vmalloc.h +++ b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp23xx/vmalloc.h + * arch/arm/mach-ixp23xx/include/mach/vmalloc.h * * Copyright (c) 2005 MontaVista Software, Inc. * diff --git a/include/asm-arm/arch-ixp4xx/avila.h b/arch/arm/mach-ixp4xx/include/mach/avila.h index 88f053d64430..1640cb61972b 100644 --- a/include/asm-arm/arch-ixp4xx/avila.h +++ b/arch/arm/mach-ixp4xx/include/mach/avila.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/avila.h + * arch/arm/mach-ixp4xx/include/mach/avila.h * * Gateworks Avila platform specific definitions * @@ -16,7 +16,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define AVILA_SDA_PIN 7 diff --git a/include/asm-arm/arch-ixp4xx/coyote.h b/arch/arm/mach-ixp4xx/include/mach/coyote.h index 428b298afc1f..717ac6d16f55 100644 --- a/include/asm-arm/arch-ixp4xx/coyote.h +++ b/arch/arm/mach-ixp4xx/include/mach/coyote.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/coyote.h + * arch/arm/mach-ixp4xx/include/mach/coyote.h * * ADI Engineering platform specific definitions * @@ -13,7 +13,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif /* PCI controller GPIO to IRQ pin mappings */ diff --git a/include/asm-arm/arch-ixp4xx/cpu.h b/arch/arm/mach-ixp4xx/include/mach/cpu.h index 2fa3d6b8dbb8..ff8aa2393bf9 100644 --- a/include/asm-arm/arch-ixp4xx/cpu.h +++ b/arch/arm/mach-ixp4xx/include/mach/cpu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/cpu.h + * arch/arm/mach-ixp4xx/include/mach/cpu.h * * IXP4XX cpu type detection * diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S index 37bc8ef23e67..7c6a6912acde 100644 --- a/include/asm-arm/arch-ixp4xx/debug-macro.S +++ b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-ixp4xx/debug-macro.S +/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-ixp4xx/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h index 0b755d6e9198..00c5070c0201 100644 --- a/include/asm-arm/arch-ixp4xx/dma.h +++ b/arch/arm/mach-ixp4xx/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/dma.h + * arch/arm/mach-ixp4xx/include/mach/dma.h * * Copyright (C) 2001-2004 MontaVista Software, Inc. * @@ -14,7 +14,7 @@ #include <linux/device.h> #include <asm/page.h> #include <asm/sizes.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) diff --git a/include/asm-arm/arch-ixp4xx/dsmg600.h b/arch/arm/mach-ixp4xx/include/mach/dsmg600.h index 5afae8c2e296..dc087a34a268 100644 --- a/include/asm-arm/arch-ixp4xx/dsmg600.h +++ b/arch/arm/mach-ixp4xx/include/mach/dsmg600.h @@ -13,7 +13,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define DSMG600_SDA_PIN 5 diff --git a/include/asm-arm/arch-ixp4xx/entry-macro.S b/arch/arm/mach-ixp4xx/include/mach/entry-macro.S index ed313c52a8a4..f2e14e94ed15 100644 --- a/include/asm-arm/arch-ixp4xx/entry-macro.S +++ b/arch/arm/mach-ixp4xx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/entry-macro.S + * arch/arm/mach-ixp4xx/include/mach/entry-macro.S * * Low-level IRQ helper macros for IXP4xx-based 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> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/arch/arm/mach-ixp4xx/include/mach/fsg.h index 168b9848eb4a..1f02b7e22a13 100644 --- a/include/asm-arm/arch-ixp4xx/fsg.h +++ b/arch/arm/mach-ixp4xx/include/mach/fsg.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/fsg.h + * arch/arm/mach-ixp4xx/include/mach/fsg.h * * Freecom FSG-3 platform specific definitions * @@ -16,7 +16,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define FSG_SDA_PIN 12 diff --git a/include/asm-arm/arch-ixp4xx/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h index 28e7d27b1b8f..9fbde177920f 100644 --- a/include/asm-arm/arch-ixp4xx/gpio.h +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp4xx/gpio.h + * arch/arm/mach-ixp4xx/include/mach/gpio.h * * IXP4XX GPIO wrappers for arch-neutral GPIO calls * @@ -25,7 +25,7 @@ #ifndef __ASM_ARCH_IXP4XX_GPIO_H #define __ASM_ARCH_IXP4XX_GPIO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline int gpio_request(unsigned gpio, const char *label) { diff --git a/include/asm-arm/arch-ixp4xx/gtwx5715.h b/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h index 2192dedc2f59..5d5e201cac7e 100644 --- a/include/asm-arm/arch-ixp4xx/gtwx5715.h +++ b/arch/arm/mach-ixp4xx/include/mach/gtwx5715.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/gtwx5715.h + * arch/arm/mach-ixp4xx/include/mach/gtwx5715.h * * Gemtek GTWX5715 Gateway (Linksys WRV54G) * @@ -21,7 +21,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #include "irqs.h" diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index fa723a627854..f58a43a23966 100644 --- a/include/asm-arm/arch-ixp4xx/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/hardware.h + * arch/arm/mach-ixp4xx/include/mach/hardware.h * * Copyright (C) 2002 Intel Corporation. * Copyright (C) 2003-2004 MontaVista Software, Inc. @@ -31,7 +31,7 @@ #include "ixp4xx-regs.h" #ifndef __ASSEMBLER__ -#include <asm/arch/cpu.h> +#include <mach/cpu.h> #endif /* Platform helper functions and definitions */ diff --git a/include/asm-arm/arch-ixp4xx/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 8e7426081f0e..319948e31bec 100644 --- a/include/asm-arm/arch-ixp4xx/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp4xx/io.h + * arch/arm/mach-ixp4xx/include/mach/io.h * * Author: Deepak Saxena <dsaxena@plexity.net> * @@ -15,7 +15,7 @@ #include <linux/bitops.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffff0000 diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h index 674af4a84147..f4d74de1566a 100644 --- a/include/asm-arm/arch-ixp4xx/irqs.h +++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/irqs.h + * arch/arm/mach-ixp4xx/include/mach/irqs.h * * IRQ definitions for IXP4XX based systems * diff --git a/include/asm-arm/arch-ixp4xx/ixdp425.h b/arch/arm/mach-ixp4xx/include/mach/ixdp425.h index d0a1dcb48d53..2cafe65ebfee 100644 --- a/include/asm-arm/arch-ixp4xx/ixdp425.h +++ b/arch/arm/mach-ixp4xx/include/mach/ixdp425.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/ixdp425.h + * arch/arm/mach-ixp4xx/include/mach/ixdp425.h * * IXDP425 platform specific definitions * @@ -13,7 +13,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define IXDP425_SDA_PIN 7 diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h index 68aca8554f5a..ad9c888dd850 100644 --- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +++ b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/ixp4xx-regs.h + * arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h * * Register definitions for IXP4xx chipset. This file contains * register location and bit definitions only. Platform specific diff --git a/include/asm-arm/arch-ixp4xx/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index af9667b57ab3..c4d2830ac987 100644 --- a/include/asm-arm/arch-ixp4xx/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp4xx/memory.h + * arch/arm/mach-ixp4xx/include/mach/memory.h * * Copyright (c) 2001-2004 MontaVista Software, Inc. */ diff --git a/include/asm-arm/arch-ixp4xx/nas100d.h b/arch/arm/mach-ixp4xx/include/mach/nas100d.h index ecb12d66399c..3771d62a9748 100644 --- a/include/asm-arm/arch-ixp4xx/nas100d.h +++ b/arch/arm/mach-ixp4xx/include/mach/nas100d.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/nas100d.h + * arch/arm/mach-ixp4xx/include/mach/nas100d.h * * NAS100D platform specific definitions * @@ -16,7 +16,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define NAS100D_SDA_PIN 5 diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/arch/arm/mach-ixp4xx/include/mach/npe.h index 37d0511689dc..37d0511689dc 100644 --- a/include/asm-arm/arch-ixp4xx/npe.h +++ b/arch/arm/mach-ixp4xx/include/mach/npe.h diff --git a/include/asm-arm/arch-ixp4xx/nslu2.h b/arch/arm/mach-ixp4xx/include/mach/nslu2.h index fa895f44e431..85d00adbfb92 100644 --- a/include/asm-arm/arch-ixp4xx/nslu2.h +++ b/arch/arm/mach-ixp4xx/include/mach/nslu2.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/nslu2.h + * arch/arm/mach-ixp4xx/include/mach/nslu2.h * * NSLU2 platform specific definitions * @@ -15,7 +15,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define NSLU2_SDA_PIN 7 diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h index b2af5154cef3..e824c02c825a 100644 --- a/include/asm-arm/arch-ixp4xx/platform.h +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/platform.h + * arch/arm/mach-ixp4xx/include/mach/platform.h * * Constants and functions that are useful to IXP4xx platform-specific code * and device drivers. @@ -8,7 +8,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #ifndef __ASSEMBLY__ diff --git a/include/asm-arm/arch-ixp4xx/prpmc1100.h b/arch/arm/mach-ixp4xx/include/mach/prpmc1100.h index 100855feafdd..17274a2e3dec 100644 --- a/include/asm-arm/arch-ixp4xx/prpmc1100.h +++ b/arch/arm/mach-ixp4xx/include/mach/prpmc1100.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/prpmc1100.h + * arch/arm/mach-ixp4xx/include/mach/prpmc1100.h * * Motorolla PrPMC1100 platform specific definitions * @@ -13,7 +13,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H__ -#error "Do not include this directly, instead #include <asm/arch/hardware.h>" +#error "Do not include this directly, instead #include <mach/hardware.h>" #endif #define PRPMC1100_FLASH_BASE IXP4XX_EXP_BUS_CS0_BASE_PHYS diff --git a/include/asm-arm/arch-ixp4xx/qmgr.h b/arch/arm/mach-ixp4xx/include/mach/qmgr.h index 1e52b95cede5..1e52b95cede5 100644 --- a/include/asm-arm/arch-ixp4xx/qmgr.h +++ b/arch/arm/mach-ixp4xx/include/mach/qmgr.h diff --git a/include/asm-arm/arch-ixp4xx/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h index f11b92262a07..92a7e8ddf69a 100644 --- a/include/asm-arm/arch-ixp4xx/system.h +++ b/arch/arm/mach-ixp4xx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/system.h + * arch/arm/mach-ixp4xx/include/mach/system.h * * Copyright (C) 2002 Intel Corporation. * @@ -9,7 +9,7 @@ * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-ixp4xx/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h index c2559e28cbcb..89ce3ee84698 100644 --- a/include/asm-arm/arch-ixp4xx/timex.h +++ b/arch/arm/mach-ixp4xx/include/mach/timex.h @@ -1,9 +1,9 @@ /* - * linux/include/asm-arm/arch-ixp4xx/timex.h + * arch/arm/mach-ixp4xx/include/mach/timex.h * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * We use IXP425 General purpose timer for our timer needs, it runs at diff --git a/include/asm-arm/arch-ixp4xx/udc.h b/arch/arm/mach-ixp4xx/include/mach/udc.h index dbdec36ff0d1..80d6da2eafac 100644 --- a/include/asm-arm/arch-ixp4xx/udc.h +++ b/arch/arm/mach-ixp4xx/include/mach/udc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp4xx/udc.h + * arch/arm/mach-ixp4xx/include/mach/udc.h * */ #include <asm/mach/udc_pxa2xx.h> diff --git a/include/asm-arm/arch-ixp4xx/uncompress.h b/arch/arm/mach-ixp4xx/include/mach/uncompress.h index 34ef48fe327e..2db0078a8cf2 100644 --- a/include/asm-arm/arch-ixp4xx/uncompress.h +++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4xx/uncompress.h + * arch/arm/mach-ixp4xx/include/mach/uncompress.h * * Copyright (C) 2002 Intel Corporation. * Copyright (C) 2003-2004 MontaVista Software, Inc. diff --git a/include/asm-arm/arch-ixp4xx/vmalloc.h b/arch/arm/mach-ixp4xx/include/mach/vmalloc.h index 050d46e6b126..7b3580b53adf 100644 --- a/include/asm-arm/arch-ixp4xx/vmalloc.h +++ b/arch/arm/mach-ixp4xx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ixp4xx/vmalloc.h + * arch/arm/mach-ixp4xx/include/mach/vmalloc.h */ #define VMALLOC_END (0xFF000000) diff --git a/include/asm-arm/arch-kirkwood/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index f55fb8ad9ee4..c0cc5b5c82ac 100644 --- a/include/asm-arm/arch-kirkwood/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S @@ -1,12 +1,12 @@ /* - * include/asm-arm/arch-kirkwood/debug-macro.S + * arch/arm/mach-kirkwood/include/mach/debug-macro.S * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-kirkwood/dma.h b/arch/arm/mach-kirkwood/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-kirkwood/dma.h +++ b/arch/arm/mach-kirkwood/include/mach/dma.h diff --git a/include/asm-arm/arch-kirkwood/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S index fc6a43d9355c..83e0cba77b36 100644 --- a/include/asm-arm/arch-kirkwood/entry-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/entry-macro.S + * arch/arm/mach-kirkwood/include/mach/entry-macro.S * * Low-level IRQ helper macros for Marvell Kirkwood platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-kirkwood/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h index e695719771a5..cde85283f7d3 100644 --- a/include/asm-arm/arch-kirkwood/hardware.h +++ b/arch/arm/mach-kirkwood/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/hardware.h + * arch/arm/mach-kirkwood/include/mach/hardware.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/include/asm-arm/arch-kirkwood/io.h b/arch/arm/mach-kirkwood/include/mach/io.h index 0ef6e95f5d5b..be07be0ef522 100644 --- a/include/asm-arm/arch-kirkwood/io.h +++ b/arch/arm/mach-kirkwood/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/io.h + * arch/arm/mach-kirkwood/include/mach/io.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-kirkwood/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h index 2e7b5da6335c..6fd05838c72d 100644 --- a/include/asm-arm/arch-kirkwood/irqs.h +++ b/arch/arm/mach-kirkwood/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/irqs.h + * arch/arm/mach-kirkwood/include/mach/irqs.h * * IRQ definitions for Marvell Kirkwood SoCs * diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index bb31b315c350..d1336b41f0fb 100644 --- a/include/asm-arm/arch-kirkwood/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/kirkwood.h + * arch/arm/mach-kirkwood/include/mach/kirkwood.h * * Generic definitions for Marvell Kirkwood SoC flavors: * 88F6180, 88F6192 and 88F6281. diff --git a/include/asm-arm/arch-mv78xx0/memory.h b/arch/arm/mach-kirkwood/include/mach/memory.h index 721a6b185b91..b5fb34bdccd5 100644 --- a/include/asm-arm/arch-mv78xx0/memory.h +++ b/arch/arm/mach-kirkwood/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/memory.h + * arch/arm/mach-kirkwood/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-mv78xx0/system.h b/arch/arm/mach-kirkwood/include/mach/system.h index 7eb47d376db9..8510f6cfdabf 100644 --- a/include/asm-arm/arch-mv78xx0/system.h +++ b/arch/arm/mach-kirkwood/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/system.h + * arch/arm/mach-kirkwood/include/mach/system.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -9,8 +9,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/mv78xx0.h> +#include <mach/hardware.h> +#include <mach/kirkwood.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-kirkwood/timex.h b/arch/arm/mach-kirkwood/include/mach/timex.h index 82122e134e3c..f77ef4a32c5f 100644 --- a/include/asm-arm/arch-kirkwood/timex.h +++ b/arch/arm/mach-kirkwood/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/timex.h + * arch/arm/mach-kirkwood/include/mach/timex.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-kirkwood/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h index a9062b6d7680..75d5497df3a8 100644 --- a/include/asm-arm/arch-kirkwood/uncompress.h +++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/uncompress.h + * arch/arm/mach-kirkwood/include/mach/uncompress.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -7,7 +7,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/kirkwood.h> +#include <mach/kirkwood.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) diff --git a/include/asm-arm/arch-ks8695/debug-macro.S b/arch/arm/mach-ks8695/include/mach/debug-macro.S index d2583ffffa95..3782c3559497 100644 --- a/include/asm-arm/arch-ks8695/debug-macro.S +++ b/arch/arm/mach-ks8695/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/debug-macro.S + * arch/arm/mach-ks8695/include/mach/debug-macro.S * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics @@ -11,8 +11,8 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> -#include <asm/arch/regs-uart.h> +#include <mach/hardware.h> +#include <mach/regs-uart.h> .macro addruart, rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-ks8695/devices.h b/arch/arm/mach-ks8695/include/mach/devices.h index 7ad2c656e162..2744fecb429c 100644 --- a/include/asm-arm/arch-ks8695/devices.h +++ b/arch/arm/mach-ks8695/include/mach/devices.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/devices.h + * arch/arm/mach-ks8695/include/mach/devices.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/dma.h b/arch/arm/mach-ks8695/include/mach/dma.h index e5159ed42a4b..561206280089 100644 --- a/include/asm-arm/arch-ks8695/dma.h +++ b/arch/arm/mach-ks8695/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/dma.h + * arch/arm/mach-ks8695/include/mach/dma.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/asm-arm/arch-ks8695/entry-macro.S b/arch/arm/mach-ks8695/include/mach/entry-macro.S index 3993cfe67cfa..b4fe0c11c6ce 100644 --- a/include/asm-arm/arch-ks8695/entry-macro.S +++ b/arch/arm/mach-ks8695/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/entry-macro.S + * arch/arm/mach-ks8695/include/mach/entry-macro.S * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics @@ -11,8 +11,8 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/hardware.h> -#include <asm/arch/regs-irq.h> +#include <mach/hardware.h> +#include <mach/regs-irq.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ks8695/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h index 65ceea28607b..73c84168761c 100644 --- a/include/asm-arm/arch-ks8695/gpio.h +++ b/arch/arm/mach-ks8695/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/gpio.h + * arch/arm/mach-ks8695/include/mach/gpio.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index cb732bff3288..1d640d075b7e 100644 --- a/include/asm-arm/arch-ks8695/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/hardware.h + * arch/arm/mach-ks8695/include/mach/hardware.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/io.h b/arch/arm/mach-ks8695/include/mach/io.h index 8edc4bd6aadf..f364f24ffe1e 100644 --- a/include/asm-arm/arch-ks8695/io.h +++ b/arch/arm/mach-ks8695/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/io.h + * arch/arm/mach-ks8695/include/mach/io.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/irqs.h b/arch/arm/mach-ks8695/include/mach/irqs.h index 8b1c4fe96a81..86fc9e6ce404 100644 --- a/include/asm-arm/arch-ks8695/irqs.h +++ b/arch/arm/mach-ks8695/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ks8695/irqs.h + * arch/arm/mach-ks8695/include/mach/irqs.h * * Copyright (C) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-ks8695/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index 1b542f77977a..dadbe66cb75c 100644 --- a/include/asm-arm/arch-ks8695/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/memory.h + * arch/arm/mach-ks8695/include/mach/memory.h * * Copyright (C) 2006 Andrew Victor * @@ -13,7 +13,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Physical SRAM offset. diff --git a/include/asm-arm/arch-ks8695/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h index 6b95d77aea19..0df6fe61d1ce 100644 --- a/include/asm-arm/arch-ks8695/regs-gpio.h +++ b/arch/arm/mach-ks8695/include/mach/regs-gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-gpio.h + * arch/arm/mach-ks8695/include/mach/regs-gpio.h * * Copyright (C) 2007 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-hpna.h b/arch/arm/mach-ks8695/include/mach/regs-hpna.h index 14091cdec103..815ce5c2e3b9 100644 --- a/include/asm-arm/arch-ks8695/regs-hpna.h +++ b/arch/arm/mach-ks8695/include/mach/regs-hpna.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-wan.h + * arch/arm/mach-ks8695/include/mach/regs-wan.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-irq.h b/arch/arm/mach-ks8695/include/mach/regs-irq.h index 70b193f6b756..352b7e8704d5 100644 --- a/include/asm-arm/arch-ks8695/regs-irq.h +++ b/arch/arm/mach-ks8695/include/mach/regs-irq.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-irq.h + * arch/arm/mach-ks8695/include/mach/regs-irq.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/regs-lan.h b/arch/arm/mach-ks8695/include/mach/regs-lan.h index a63bd61c64ed..9ef409901e76 100644 --- a/include/asm-arm/arch-ks8695/regs-lan.h +++ b/arch/arm/mach-ks8695/include/mach/regs-lan.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-lan.h + * arch/arm/mach-ks8695/include/mach/regs-lan.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-mem.h b/arch/arm/mach-ks8695/include/mach/regs-mem.h index 76b38e0862e6..55806bc68ce3 100644 --- a/include/asm-arm/arch-ks8695/regs-mem.h +++ b/arch/arm/mach-ks8695/include/mach/regs-mem.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-mem.h + * arch/arm/mach-ks8695/include/mach/regs-mem.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-misc.h b/arch/arm/mach-ks8695/include/mach/regs-misc.h index 632ca6601a94..2740c52494a0 100644 --- a/include/asm-arm/arch-ks8695/regs-misc.h +++ b/arch/arm/mach-ks8695/include/mach/regs-misc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-misc.h + * arch/arm/mach-ks8695/include/mach/regs-misc.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-pci.h b/arch/arm/mach-ks8695/include/mach/regs-pci.h index 286d6d488df8..75a9db6edbd9 100644 --- a/include/asm-arm/arch-ks8695/regs-pci.h +++ b/arch/arm/mach-ks8695/include/mach/regs-pci.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-pci.h + * arch/arm/mach-ks8695/include/mach/regs-pci.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/regs-switch.h b/arch/arm/mach-ks8695/include/mach/regs-switch.h index 5f37be3f2f60..56d12e8de895 100644 --- a/include/asm-arm/arch-ks8695/regs-switch.h +++ b/arch/arm/mach-ks8695/include/mach/regs-switch.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-switch.h + * arch/arm/mach-ks8695/include/mach/regs-switch.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/regs-sys.h b/arch/arm/mach-ks8695/include/mach/regs-sys.h index f3179815b8ee..57c20be0c129 100644 --- a/include/asm-arm/arch-ks8695/regs-sys.h +++ b/arch/arm/mach-ks8695/include/mach/regs-sys.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-sys.h + * arch/arm/mach-ks8695/include/mach/regs-sys.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/regs-timer.h b/arch/arm/mach-ks8695/include/mach/regs-timer.h index 0a9f7f99ec52..e620cda99d2d 100644 --- a/include/asm-arm/arch-ks8695/regs-timer.h +++ b/arch/arm/mach-ks8695/include/mach/regs-timer.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-timer.h + * arch/arm/mach-ks8695/include/mach/regs-timer.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/regs-uart.h b/arch/arm/mach-ks8695/include/mach/regs-uart.h index a27cb20502a3..8581fbc6245f 100644 --- a/include/asm-arm/arch-ks8695/regs-uart.h +++ b/arch/arm/mach-ks8695/include/mach/regs-uart.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ks8695/regs-uart.h + * arch/arm/mach-ks8695/include/mach/regs-uart.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics diff --git a/include/asm-arm/arch-ks8695/regs-wan.h b/arch/arm/mach-ks8695/include/mach/regs-wan.h index 52e35b0d65e4..eb494ec6e956 100644 --- a/include/asm-arm/arch-ks8695/regs-wan.h +++ b/arch/arm/mach-ks8695/include/mach/regs-wan.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/regs-wan.h + * arch/arm/mach-ks8695/include/mach/regs-wan.h * * Copyright (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-ks8695/system.h b/arch/arm/mach-ks8695/include/mach/system.h index 3bc28106d937..2a6f91869056 100644 --- a/include/asm-arm/arch-ks8695/system.h +++ b/arch/arm/mach-ks8695/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-s3c2410/system.h + * arch/arm/mach-s3c2410/include/mach/system.h * * Copyright (C) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -15,7 +15,7 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/io.h> -#include <asm/arch/regs-timer.h> +#include <mach/regs-timer.h> static void arch_idle(void) { diff --git a/include/asm-arm/arch-ks8695/timex.h b/arch/arm/mach-ks8695/include/mach/timex.h index 8320d528b903..4682e350369b 100644 --- a/include/asm-arm/arch-ks8695/timex.h +++ b/arch/arm/mach-ks8695/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/timex.h + * arch/arm/mach-ks8695/include/mach/timex.h * * Copyright (C) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-ks8695/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h index 733a50855b5d..0eee37a69075 100644 --- a/include/asm-arm/arch-ks8695/uncompress.h +++ b/arch/arm/mach-ks8695/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/uncompress.h + * arch/arm/mach-ks8695/include/mach/uncompress.h * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics @@ -15,7 +15,7 @@ #define __ASM_ARCH_UNCOMPRESS_H #include <asm/io.h> -#include <asm/arch/regs-uart.h> +#include <mach/regs-uart.h> static void putc(char c) { diff --git a/include/asm-arm/arch-ks8695/vmalloc.h b/arch/arm/mach-ks8695/include/mach/vmalloc.h index d1d88e58117d..744ac66be3a2 100644 --- a/include/asm-arm/arch-ks8695/vmalloc.h +++ b/arch/arm/mach-ks8695/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ks8695/vmalloc.h + * arch/arm/mach-ks8695/include/mach/vmalloc.h * * Copyright (C) 2006 Ben Dooks * Copyright (C) 2006 Simtec Electronics <linux@simtec.co.uk> diff --git a/include/asm-arm/arch-l7200/aux_reg.h b/arch/arm/mach-l7200/include/mach/aux_reg.h index 762cbc76c501..4671558cdd51 100644 --- a/include/asm-arm/arch-l7200/aux_reg.h +++ b/arch/arm/mach-l7200/include/mach/aux_reg.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/aux_reg.h + * arch/arm/mach-l7200/include/mach/aux_reg.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ #ifndef _ASM_ARCH_AUXREG_H #define _ASM_ARCH_AUXREG_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) diff --git a/include/asm-arm/arch-l7200/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S index 846473318e8b..34eed2a63e69 100644 --- a/include/asm-arm/arch-l7200/debug-macro.S +++ b/arch/arm/mach-l7200/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-l7200/debug-macro.S +/* arch/arm/mach-l7200/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-l7200/dma.h b/arch/arm/mach-l7200/include/mach/dma.h index 4c7eca63f035..c7e48bd4590c 100644 --- a/include/asm-arm/arch-l7200/dma.h +++ b/arch/arm/mach-l7200/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/dma.h + * arch/arm/mach-l7200/include/mach/dma.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * diff --git a/include/asm-arm/arch-l7200/entry-macro.S b/arch/arm/mach-l7200/include/mach/entry-macro.S index d5e7294df1d5..1726d91fc1d3 100644 --- a/include/asm-arm/arch-l7200/entry-macro.S +++ b/arch/arm/mach-l7200/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-l7200/entry-macro.S + * arch/arm/mach-l7200/include/mach/entry-macro.S * * Low-level IRQ helper macros for L7200-based 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> .equ irq_base_addr, IO_BASE_2 diff --git a/include/asm-arm/arch-l7200/gp_timers.h b/arch/arm/mach-l7200/include/mach/gp_timers.h index 6f20962df248..2b7086a26b81 100644 --- a/include/asm-arm/arch-l7200/gp_timers.h +++ b/arch/arm/mach-l7200/include/mach/gp_timers.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/gp_timers.h + * arch/arm/mach-l7200/include/mach/gp_timers.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -10,7 +10,7 @@ #ifndef _ASM_ARCH_GPTIMERS_H #define _ASM_ARCH_GPTIMERS_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Layout of L7200 general purpose timer registers diff --git a/include/asm-arm/arch-l7200/gpio.h b/arch/arm/mach-l7200/include/mach/gpio.h index 0b63e4239bdd..c7b0a5d7b8bb 100644 --- a/include/asm-arm/arch-l7200/gpio.h +++ b/arch/arm/mach-l7200/include/mach/gpio.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/gpio.h + * arch/arm/mach-l7200/include/mach/gpio.h * * Registers and helper functions for the L7200 Link-Up Systems * GPIO. diff --git a/include/asm-arm/arch-l7200/hardware.h b/arch/arm/mach-l7200/include/mach/hardware.h index 2ab43f3a4a8d..c31909cfc254 100644 --- a/include/asm-arm/arch-l7200/hardware.h +++ b/arch/arm/mach-l7200/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/hardware.h + * arch/arm/mach-l7200/include/mach/hardware.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/io.h b/arch/arm/mach-l7200/include/mach/io.h index e24a10a7ed8c..d432ba9e5dff 100644 --- a/include/asm-arm/arch-l7200/io.h +++ b/arch/arm/mach-l7200/include/mach/io.h @@ -1,16 +1,16 @@ /* - * linux/include/asm-arm/arch-l7200/io.h + * arch/arm/mach-l7200/include/mach/io.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * * Changelog: - * 03-21-2000 SJH Created from linux/include/asm-arm/arch-nexuspci/io.h + * 03-21-2000 SJH Created from arch/arm/mach-nexuspci/include/mach/io.h * 08-31-2000 SJH Added in IO functions necessary for new drivers */ #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-l7200/irqs.h b/arch/arm/mach-l7200/include/mach/irqs.h index 7120c016e29e..7edffd713c5b 100644 --- a/include/asm-arm/arch-l7200/irqs.h +++ b/arch/arm/mach-l7200/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-l7200/irqs.h + * arch/arm/mach-l7200/include/mach/irqs.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/memory.h b/arch/arm/mach-l7200/include/mach/memory.h index 402df637e740..f338cf3ffd93 100644 --- a/include/asm-arm/arch-l7200/memory.h +++ b/arch/arm/mach-l7200/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/memory.h + * arch/arm/mach-l7200/include/mach/memory.h * * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) diff --git a/include/asm-arm/arch-l7200/pmpcon.h b/arch/arm/mach-l7200/include/mach/pmpcon.h index 730056c194be..3959871e8361 100644 --- a/include/asm-arm/arch-l7200/pmpcon.h +++ b/arch/arm/mach-l7200/include/mach/pmpcon.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/pmpcon.h + * arch/arm/mach-l7200/include/mach/pmpcon.h * * Registers and helper functions for the L7200 Link-Up Systems * DC/DC converter register. diff --git a/include/asm-arm/arch-l7200/pmu.h b/arch/arm/mach-l7200/include/mach/pmu.h index 57faea76d1b3..a2da7aedf208 100644 --- a/include/asm-arm/arch-l7200/pmu.h +++ b/arch/arm/mach-l7200/include/mach/pmu.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/pmu.h + * arch/arm/mach-l7200/include/mach/pmu.h * * Registers and helper functions for the L7200 Link-Up Systems * Power Management Unit (PMU). diff --git a/include/asm-arm/arch-l7200/serial.h b/arch/arm/mach-l7200/include/mach/serial.h index defb8b7fca73..adc05e5f8378 100644 --- a/include/asm-arm/arch-l7200/serial.h +++ b/arch/arm/mach-l7200/include/mach/serial.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/serial.h + * arch/arm/mach-l7200/include/mach/serial.h * * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/serial_l7200.h b/arch/arm/mach-l7200/include/mach/serial_l7200.h index b1008a9d23e5..645f1c5e568d 100644 --- a/include/asm-arm/arch-l7200/serial_l7200.h +++ b/arch/arm/mach-l7200/include/mach/serial_l7200.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/serial_l7200.h + * arch/arm/mach-l7200/include/mach/serial_l7200.h * * Copyright (c) 2000 Steven Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ #ifndef __ASM_ARCH_SERIAL_L7200_H #define __ASM_ARCH_SERIAL_L7200_H -#include <asm/arch/memory.h> +#include <mach/memory.h> /* * This assumes you have a 3.6864 MHz clock for your UART. diff --git a/include/asm-arm/arch-l7200/sib.h b/arch/arm/mach-l7200/include/mach/sib.h index bf4364ee2535..965728712cf3 100644 --- a/include/asm-arm/arch-l7200/sib.h +++ b/arch/arm/mach-l7200/include/mach/sib.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/sib.h + * arch/arm/mach-l7200/include/mach/sib.h * * Registers and helper functions for the Serial Interface Bus. * diff --git a/include/asm-arm/arch-l7200/sys-clock.h b/arch/arm/mach-l7200/include/mach/sys-clock.h index 771c774f4815..2d7722be60ea 100644 --- a/include/asm-arm/arch-l7200/sys-clock.h +++ b/arch/arm/mach-l7200/include/mach/sys-clock.h @@ -1,6 +1,6 @@ /****************************************************************************/ /* - * linux/include/asm-arm/arch-l7200/sys-clock.h + * arch/arm/mach-l7200/include/mach/sys-clock.h * * Registers and helper functions for the L7200 Link-Up Systems * System clocks. diff --git a/include/asm-arm/arch-l7200/system.h b/arch/arm/mach-l7200/include/mach/system.h index efef950a5b5d..5272abee0d0e 100644 --- a/include/asm-arm/arch-l7200/system.h +++ b/arch/arm/mach-l7200/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/system.h + * arch/arm/mach-l7200/include/mach/system.h * * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-l7200/time.h b/arch/arm/mach-l7200/include/mach/time.h index ea22f7fff9cd..061771c2c2bd 100644 --- a/include/asm-arm/arch-l7200/time.h +++ b/arch/arm/mach-l7200/include/mach/time.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/time.h + * arch/arm/mach-l7200/include/mach/time.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) @@ -11,7 +11,7 @@ #ifndef _ASM_ARCH_TIME_H #define _ASM_ARCH_TIME_H -#include <asm/arch/irqs.h> +#include <mach/irqs.h> /* * RTC base register address diff --git a/include/asm-arm/arch-l7200/timex.h b/arch/arm/mach-l7200/include/mach/timex.h index 3c3202620f00..ffc96a63b5a2 100644 --- a/include/asm-arm/arch-l7200/timex.h +++ b/arch/arm/mach-l7200/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/timex.h + * arch/arm/mach-l7200/include/mach/timex.h * * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) * Steve Hill (sjhill@cotw.com) diff --git a/include/asm-arm/arch-l7200/uncompress.h b/arch/arm/mach-l7200/include/mach/uncompress.h index c5ba0adf4a5d..591c962bb315 100644 --- a/include/asm-arm/arch-l7200/uncompress.h +++ b/arch/arm/mach-l7200/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-l7200/uncompress.h + * arch/arm/mach-l7200/include/mach/uncompress.h * * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) * @@ -9,7 +9,7 @@ * 07-26-2000 SJH Removed hard coded baud rate */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_UART IO_START + 0x00044000 diff --git a/include/asm-arm/arch-l7200/vmalloc.h b/arch/arm/mach-l7200/include/mach/vmalloc.h index 816231eedaac..85f0abbf15f1 100644 --- a/include/asm-arm/arch-l7200/vmalloc.h +++ b/arch/arm/mach-l7200/include/mach/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-l7200/vmalloc.h + * arch/arm/mach-l7200/include/mach/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x10000000) diff --git a/include/asm-arm/arch-lh7a40x/clocks.h b/arch/arm/mach-lh7a40x/include/mach/clocks.h index 7d0ba18ad578..fe2e0255c084 100644 --- a/include/asm-arm/arch-lh7a40x/clocks.h +++ b/arch/arm/mach-lh7a40x/include/mach/clocks.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/clocks.h +/* arch/arm/mach-lh7a40x/include/mach/clocks.h * * Copyright (C) 2004 Marc Singer * diff --git a/include/asm-arm/arch-lh7a40x/constants.h b/arch/arm/mach-lh7a40x/include/mach/constants.h index 51de96e87faf..55c6edbc2dfd 100644 --- a/include/asm-arm/arch-lh7a40x/constants.h +++ b/arch/arm/mach-lh7a40x/include/mach/constants.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/constants.h +/* arch/arm/mach-lh7a40x/include/mach/constants.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development diff --git a/include/asm-arm/arch-lh7a40x/debug-macro.S b/arch/arm/mach-lh7a40x/include/mach/debug-macro.S index 421dcd6a8506..85141ed5383d 100644 --- a/include/asm-arm/arch-lh7a40x/debug-macro.S +++ b/arch/arm/mach-lh7a40x/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-lh7a40x/debug-macro.S +/* arch/arm/mach-lh7a40x/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-lh7a40x/dma.h b/arch/arm/mach-lh7a40x/include/mach/dma.h index a8cbd14bbf9d..baa3f8dbd04b 100644 --- a/include/asm-arm/arch-lh7a40x/dma.h +++ b/arch/arm/mach-lh7a40x/include/mach/dma.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/dma.h +/* arch/arm/mach-lh7a40x/include/mach/dma.h * * Copyright (C) 2005 Marc Singer * diff --git a/include/asm-arm/arch-lh7a40x/entry-macro.S b/arch/arm/mach-lh7a40x/include/mach/entry-macro.S index 34468e064629..069bb4cefff7 100644 --- a/include/asm-arm/arch-lh7a40x/entry-macro.S +++ b/arch/arm/mach-lh7a40x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-lh7a40x/entry-macro.S + * arch/arm/mach-lh7a40x/include/mach/entry-macro.S * * Low-level IRQ helper macros for LH7A40x 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> /* In order to allow there to be support for both of the processor classes at the same time, we make a hack here that isn't very diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/arch/arm/mach-lh7a40x/include/mach/hardware.h index e9ff74fd7939..48e827d2fa56 100644 --- a/include/asm-arm/arch-lh7a40x/hardware.h +++ b/arch/arm/mach-lh7a40x/include/mach/hardware.h @@ -1,8 +1,8 @@ -/* include/asm-arm/arch-lh7a40x/hardware.h +/* arch/arm/mach-lh7a40x/include/mach/hardware.h * * Copyright (C) 2004 Coastal Environmental Systems * - * [ Substantially cribbed from include/asm-arm/arch-pxa/hardware.h ] + * [ Substantially cribbed from arch/arm/mach-pxa/include/mach/hardware.h ] * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/include/asm-arm/arch-lh7a40x/io.h b/arch/arm/mach-lh7a40x/include/mach/io.h index 8d591d0927c1..031d26f9163c 100644 --- a/include/asm-arm/arch-lh7a40x/io.h +++ b/arch/arm/mach-lh7a40x/include/mach/io.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/io.h +/* arch/arm/mach-lh7a40x/include/mach/io.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_IO_H #define __ASM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-lh7a40x/irqs.h b/arch/arm/mach-lh7a40x/include/mach/irqs.h index afe8c7cbad6a..0f9b83675935 100644 --- a/include/asm-arm/arch-lh7a40x/irqs.h +++ b/arch/arm/mach-lh7a40x/include/mach/irqs.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/irqs.h +/* arch/arm/mach-lh7a40x/include/mach/irqs.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h index 9b0c8012e713..f7107b4c197a 100644 --- a/include/asm-arm/arch-lh7a40x/memory.h +++ b/arch/arm/mach-lh7a40x/include/mach/memory.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/memory.h +/* arch/arm/mach-lh7a40x/include/mach/memory.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/include/asm-arm/arch-lh7a40x/registers.h b/arch/arm/mach-lh7a40x/include/mach/registers.h index b4f09b3e2d03..ea44396383a7 100644 --- a/include/asm-arm/arch-lh7a40x/registers.h +++ b/arch/arm/mach-lh7a40x/include/mach/registers.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/registers.h +/* arch/arm/mach-lh7a40x/include/mach/registers.h * * Copyright (C) 2004 Coastal Environmental Systems * Copyright (C) 2004 Logic Product Development @@ -9,7 +9,7 @@ * */ -#include <asm/arch/constants.h> +#include <mach/constants.h> #ifndef __ASM_ARCH_REGISTERS_H #define __ASM_ARCH_REGISTERS_H diff --git a/include/asm-arm/arch-lh7a40x/ssp.h b/arch/arm/mach-lh7a40x/include/mach/ssp.h index 132b1c4d5ce6..132b1c4d5ce6 100644 --- a/include/asm-arm/arch-lh7a40x/ssp.h +++ b/arch/arm/mach-lh7a40x/include/mach/ssp.h diff --git a/include/asm-arm/arch-lh7a40x/system.h b/arch/arm/mach-lh7a40x/include/mach/system.h index e1df8aa460f2..fa46bb1ef07b 100644 --- a/include/asm-arm/arch-lh7a40x/system.h +++ b/arch/arm/mach-lh7a40x/include/mach/system.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/system.h +/* arch/arm/mach-lh7a40x/include/mach/system.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/include/asm-arm/arch-lh7a40x/timex.h b/arch/arm/mach-lh7a40x/include/mach/timex.h index fa726b670829..08028cef1b3b 100644 --- a/include/asm-arm/arch-lh7a40x/timex.h +++ b/arch/arm/mach-lh7a40x/include/mach/timex.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/timex.h +/* arch/arm/mach-lh7a40x/include/mach/timex.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -8,7 +8,7 @@ * */ -#include <asm/arch/constants.h> +#include <mach/constants.h> #define CLOCK_TICK_RATE (PLL_CLOCK/6/16) diff --git a/include/asm-arm/arch-lh7a40x/uncompress.h b/arch/arm/mach-lh7a40x/include/mach/uncompress.h index 3d1ce0426a33..55b80d479eb4 100644 --- a/include/asm-arm/arch-lh7a40x/uncompress.h +++ b/arch/arm/mach-lh7a40x/include/mach/uncompress.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/uncompress.h +/* arch/arm/mach-lh7a40x/include/mach/uncompress.h * * Copyright (C) 2004 Coastal Environmental Systems * @@ -8,7 +8,7 @@ * */ -#include <asm/arch/registers.h> +#include <mach/registers.h> #ifndef UART_R_DATA # define UART_R_DATA (0x00) diff --git a/include/asm-arm/arch-lh7a40x/vmalloc.h b/arch/arm/mach-lh7a40x/include/mach/vmalloc.h index 8163e45109b9..3fbd49490bb9 100644 --- a/include/asm-arm/arch-lh7a40x/vmalloc.h +++ b/arch/arm/mach-lh7a40x/include/mach/vmalloc.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-lh7a40x/vmalloc.h +/* arch/arm/mach-lh7a40x/include/mach/vmalloc.h * * Copyright (C) 2004 Coastal Environmental Systems * diff --git a/include/asm-arm/arch-loki/debug-macro.S b/arch/arm/mach-loki/include/mach/debug-macro.S index 585502e96513..a8c20bd2f951 100644 --- a/include/asm-arm/arch-loki/debug-macro.S +++ b/arch/arm/mach-loki/include/mach/debug-macro.S @@ -1,12 +1,12 @@ /* - * include/asm-arm/arch-loki/debug-macro.S + * arch/arm/mach-loki/include/mach/debug-macro.S * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/loki.h> +#include <mach/loki.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-loki/dma.h b/arch/arm/mach-loki/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-loki/dma.h +++ b/arch/arm/mach-loki/include/mach/dma.h diff --git a/include/asm-arm/arch-loki/entry-macro.S b/arch/arm/mach-loki/include/mach/entry-macro.S index 693257cdbeb8..332af38ec13c 100644 --- a/include/asm-arm/arch-loki/entry-macro.S +++ b/arch/arm/mach-loki/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/entry-macro.S + * arch/arm/mach-loki/include/mach/entry-macro.S * * Low-level IRQ helper macros for Marvell Loki (88RC8480) platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/loki.h> +#include <mach/loki.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-loki/hardware.h b/arch/arm/mach-loki/include/mach/hardware.h index f65b01c733b6..d7bfc8f17729 100644 --- a/include/asm-arm/arch-loki/hardware.h +++ b/arch/arm/mach-loki/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/hardware.h + * arch/arm/mach-loki/include/mach/hardware.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/include/asm-arm/arch-loki/io.h b/arch/arm/mach-loki/include/mach/io.h index e7418a915e75..a373cd582c84 100644 --- a/include/asm-arm/arch-loki/io.h +++ b/arch/arm/mach-loki/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/io.h + * arch/arm/mach-loki/include/mach/io.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-loki/irqs.h b/arch/arm/mach-loki/include/mach/irqs.h index 7e4971438072..9fbd3326867b 100644 --- a/include/asm-arm/arch-loki/irqs.h +++ b/arch/arm/mach-loki/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/irqs.h + * arch/arm/mach-loki/include/mach/irqs.h * * IRQ definitions for Marvell Loki (88RC8480) SoCs * diff --git a/include/asm-arm/arch-loki/loki.h b/arch/arm/mach-loki/include/mach/loki.h index 5dd05ee0a4e6..c00af6ba5578 100644 --- a/include/asm-arm/arch-loki/loki.h +++ b/arch/arm/mach-loki/include/mach/loki.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/loki.h + * arch/arm/mach-loki/include/mach/loki.h * * Generic definitions for Marvell Loki (88RC8480) SoC flavors * diff --git a/include/asm-arm/arch-kirkwood/memory.h b/arch/arm/mach-loki/include/mach/memory.h index e5108f408ce6..a39533ab489d 100644 --- a/include/asm-arm/arch-kirkwood/memory.h +++ b/arch/arm/mach-loki/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/memory.h + * arch/arm/mach-loki/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-loki/system.h b/arch/arm/mach-loki/include/mach/system.h index a3568ac8ec35..8db1147d4ec5 100644 --- a/include/asm-arm/arch-loki/system.h +++ b/arch/arm/mach-loki/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/system.h + * arch/arm/mach-loki/include/mach/system.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -9,8 +9,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/loki.h> +#include <mach/hardware.h> +#include <mach/loki.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-loki/timex.h b/arch/arm/mach-loki/include/mach/timex.h index 940014f97cae..9df210915297 100644 --- a/include/asm-arm/arch-loki/timex.h +++ b/arch/arm/mach-loki/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/timex.h + * arch/arm/mach-loki/include/mach/timex.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-loki/uncompress.h b/arch/arm/mach-loki/include/mach/uncompress.h index 89a0cf88d3a5..90b2a7e65da3 100644 --- a/include/asm-arm/arch-loki/uncompress.h +++ b/arch/arm/mach-loki/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/uncompress.h + * arch/arm/mach-loki/include/mach/uncompress.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -7,7 +7,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/loki.h> +#include <mach/loki.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) diff --git a/include/asm-arm/arch-msm/board.h b/arch/arm/mach-msm/include/mach/board.h index 763051f8ba14..a7639493c095 100644 --- a/include/asm-arm/arch-msm/board.h +++ b/arch/arm/mach-msm/include/mach/board.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/board.h +/* arch/arm/mach-msm/include/mach/board.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index e131b44b2107..528eef4b605c 100644 --- a/include/asm-arm/arch-msm/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm7200/debug-macro.S +/* arch/arm/mach-msm7200/include/mach/debug-macro.S * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> @@ -14,8 +14,8 @@ * */ -#include <asm/arch/hardware.h> -#include <asm/arch/msm_iomap.h> +#include <mach/hardware.h> +#include <mach/msm_iomap.h> .macro addruart,rx @ see if the MMU is enabled and select appropriate base address diff --git a/include/asm-arm/arch-msm/dma.h b/arch/arm/mach-msm/include/mach/dma.h index e4b565b27b35..ad1c87f86d10 100644 --- a/include/asm-arm/arch-msm/dma.h +++ b/arch/arm/mach-msm/include/mach/dma.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/dma.h +/* arch/arm/mach-msm/include/mach/dma.h * * Copyright (C) 2007 Google, Inc. * @@ -16,7 +16,7 @@ #ifndef __ASM_ARCH_MSM_DMA_H #include <linux/list.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> struct msm_dmov_cmd { struct list_head list; diff --git a/include/asm-arm/arch-msm/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S index ee24aece4cb0..d2259486bcb1 100644 --- a/include/asm-arm/arch-msm/entry-macro.S +++ b/arch/arm/mach-msm/include/mach/entry-macro.S @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm7200/entry-macro.S +/* arch/arm/mach-msm7200/include/mach/entry-macro.S * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> @@ -14,7 +14,7 @@ * */ -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-msm/hardware.h b/arch/arm/mach-msm/include/mach/hardware.h index 89af2b70182f..2d126091ae41 100644 --- a/include/asm-arm/arch-msm/hardware.h +++ b/arch/arm/mach-msm/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/hardware.h +/* arch/arm/mach-msm/include/mach/hardware.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/io.h b/arch/arm/mach-msm/include/mach/io.h index 4645ae26b62a..c6a2feb268b0 100644 --- a/include/asm-arm/arch-msm/io.h +++ b/arch/arm/mach-msm/include/mach/io.h @@ -1,4 +1,4 @@ -/* include/asm-arm/arch-msm/io.h +/* arch/arm/mach-msm/include/mach/io.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/irqs.h b/arch/arm/mach-msm/include/mach/irqs.h index e62a108b1857..9dd4cf8a2693 100644 --- a/include/asm-arm/arch-msm/irqs.h +++ b/arch/arm/mach-msm/include/mach/irqs.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/irqs.h +/* arch/arm/mach-msm/include/mach/irqs.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/memory.h b/arch/arm/mach-msm/include/mach/memory.h index b5ce0e9ac86d..63fd47f2e62e 100644 --- a/include/asm-arm/arch-msm/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/memory.h +/* arch/arm/mach-msm/include/mach/memory.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index b8955cc26fec..e221f58ceea3 100644 --- a/include/asm-arm/arch-msm/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/msm_iomap.h +/* arch/arm/mach-msm/include/mach/msm_iomap.h * * Copyright (C) 2007 Google, Inc. * Author: Brian Swetland <swetland@google.com> diff --git a/include/asm-arm/arch-msm/system.h b/arch/arm/mach-msm/include/mach/system.h index fb31b3aa6750..f05ad2e0f235 100644 --- a/include/asm-arm/arch-msm/system.h +++ b/arch/arm/mach-msm/include/mach/system.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/system.h +/* arch/arm/mach-msm/include/mach/system.h * * Copyright (C) 2007 Google, Inc. * @@ -13,7 +13,7 @@ * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> void arch_idle(void); diff --git a/include/asm-arm/arch-msm/timex.h b/arch/arm/mach-msm/include/mach/timex.h index 8724487ab4c9..a62e6b215aec 100644 --- a/include/asm-arm/arch-msm/timex.h +++ b/arch/arm/mach-msm/include/mach/timex.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/timex.h +/* arch/arm/mach-msm/include/mach/timex.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h index e91ed786ffec..026e8955ace9 100644 --- a/include/asm-arm/arch-msm/uncompress.h +++ b/arch/arm/mach-msm/include/mach/uncompress.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/uncompress.h +/* arch/arm/mach-msm/include/mach/uncompress.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-msm/vmalloc.h b/arch/arm/mach-msm/include/mach/vmalloc.h index 60f8d910e825..05f81fd8623c 100644 --- a/include/asm-arm/arch-msm/vmalloc.h +++ b/arch/arm/mach-msm/include/mach/vmalloc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/vmalloc.h +/* arch/arm/mach-msm/include/mach/vmalloc.h * * Copyright (C) 2007 Google, Inc. * diff --git a/include/asm-arm/arch-mv78xx0/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S index d0595bd645e5..a06442fbd341 100644 --- a/include/asm-arm/arch-mv78xx0/debug-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S @@ -1,12 +1,12 @@ /* - * include/asm-arm/arch-mv78xx0/debug-macro.S + * arch/arm/mach-mv78xx0/include/mach/debug-macro.S * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/mv78xx0.h> +#include <mach/mv78xx0.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-mv78xx0/dma.h b/arch/arm/mach-mv78xx0/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-mv78xx0/dma.h +++ b/arch/arm/mach-mv78xx0/include/mach/dma.h diff --git a/include/asm-arm/arch-mv78xx0/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S index e9a606b12669..ed4a46bcd3b0 100644 --- a/include/asm-arm/arch-mv78xx0/entry-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/entry-macro.S + * arch/arm/mach-mv78xx0/include/mach/entry-macro.S * * Low-level IRQ helper macros for Marvell MV78xx0 platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/mv78xx0.h> +#include <mach/mv78xx0.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-mv78xx0/hardware.h b/arch/arm/mach-mv78xx0/include/mach/hardware.h index 8e17926086c6..5d887557e123 100644 --- a/include/asm-arm/arch-mv78xx0/hardware.h +++ b/arch/arm/mach-mv78xx0/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/hardware.h + * arch/arm/mach-mv78xx0/include/mach/hardware.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-mv78xx0/io.h b/arch/arm/mach-mv78xx0/include/mach/io.h index 415d4c98e3d1..450e0e1ad092 100644 --- a/include/asm-arm/arch-mv78xx0/io.h +++ b/arch/arm/mach-mv78xx0/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/io.h + * arch/arm/mach-mv78xx0/include/mach/io.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-mv78xx0/irqs.h b/arch/arm/mach-mv78xx0/include/mach/irqs.h index 75930450cd65..995d7fb8d06f 100644 --- a/include/asm-arm/arch-mv78xx0/irqs.h +++ b/arch/arm/mach-mv78xx0/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/irqs.h + * arch/arm/mach-mv78xx0/include/mach/irqs.h * * IRQ definitions for Marvell MV78xx0 SoCs * diff --git a/include/asm-arm/arch-loki/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h index 835101e49875..9e47a140ff7a 100644 --- a/include/asm-arm/arch-loki/memory.h +++ b/arch/arm/mach-mv78xx0/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-loki/memory.h + * arch/arm/mach-mv78xx0/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-mv78xx0/mv78xx0.h b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h index 9f5d83c73faa..ad664178d6e1 100644 --- a/include/asm-arm/arch-mv78xx0/mv78xx0.h +++ b/arch/arm/mach-mv78xx0/include/mach/mv78xx0.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/mv78xx0.h + * arch/arm/mach-mv78xx0/include/mach/mv78xx0.h * * Generic definitions for Marvell MV78xx0 SoC flavors: * MV781x0 and MV782x0. diff --git a/include/asm-arm/arch-kirkwood/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h index 8dde7e379855..7d5179408832 100644 --- a/include/asm-arm/arch-kirkwood/system.h +++ b/arch/arm/mach-mv78xx0/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-kirkwood/system.h + * arch/arm/mach-mv78xx0/include/mach/system.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -9,8 +9,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/kirkwood.h> +#include <mach/hardware.h> +#include <mach/mv78xx0.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-mv78xx0/timex.h b/arch/arm/mach-mv78xx0/include/mach/timex.h index a854b1ccbd01..0e8c443c723a 100644 --- a/include/asm-arm/arch-mv78xx0/timex.h +++ b/arch/arm/mach-mv78xx0/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/timex.h + * arch/arm/mach-mv78xx0/include/mach/timex.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-mv78xx0/uncompress.h b/arch/arm/mach-mv78xx0/include/mach/uncompress.h index 3bfe0a293ef7..365264298e79 100644 --- a/include/asm-arm/arch-mv78xx0/uncompress.h +++ b/arch/arm/mach-mv78xx0/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mv78xx0/uncompress.h + * arch/arm/mach-mv78xx0/include/mach/uncompress.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -7,7 +7,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/mv78xx0.h> +#include <mach/mv78xx0.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) diff --git a/include/asm-arm/arch-netx/debug-macro.S b/arch/arm/mach-netx/include/mach/debug-macro.S index a940d0e80cb2..11b9d5b46390 100644 --- a/include/asm-arm/arch-netx/debug-macro.S +++ b/arch/arm/mach-netx/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-netx/debug-macro.S +/* arch/arm/mach-netx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-netx/dma.h b/arch/arm/mach-netx/include/mach/dma.h index 4eda5feed81c..690b3ebc43ac 100644 --- a/include/asm-arm/arch-netx/dma.h +++ b/arch/arm/mach-netx/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/dma.h + * arch/arm/mach-netx/include/mach/dma.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/entry-macro.S b/arch/arm/mach-netx/include/mach/entry-macro.S index 4115bbdf97ae..a1952a0feda6 100644 --- a/include/asm-arm/arch-netx/entry-macro.S +++ b/arch/arm/mach-netx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/entry-macro.S + * arch/arm/mach-netx/include/mach/entry-macro.S * * Low-level IRQ helper macros for Hilscher netX based platforms * @@ -18,7 +18,7 @@ * 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> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-netx/eth.h b/arch/arm/mach-netx/include/mach/eth.h index 643c90ef8b72..88af1ac28ead 100644 --- a/include/asm-arm/arch-netx/eth.h +++ b/arch/arm/mach-netx/include/mach/eth.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/eth.h + * arch/arm/mach-netx/include/mach/eth.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/hardware.h b/arch/arm/mach-netx/include/mach/hardware.h index 7786c45455cd..517a2bd37842 100644 --- a/include/asm-arm/arch-netx/hardware.h +++ b/arch/arm/mach-netx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/hardware.h + * arch/arm/mach-netx/include/mach/hardware.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/io.h b/arch/arm/mach-netx/include/mach/io.h index a7a53f80165d..468b92a82585 100644 --- a/include/asm-arm/arch-netx/io.h +++ b/arch/arm/mach-netx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/io.h + * arch/arm/mach-netx/include/mach/io.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/irqs.h b/arch/arm/mach-netx/include/mach/irqs.h index a487dc6e2661..6ce914d54a30 100644 --- a/include/asm-arm/arch-netx/irqs.h +++ b/arch/arm/mach-netx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/irqs.h + * arch/arm/mach-netx/include/mach/irqs.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/memory.h b/arch/arm/mach-netx/include/mach/memory.h index 6d8d2df3e99d..53745a1378de 100644 --- a/include/asm-arm/arch-netx/memory.h +++ b/arch/arm/mach-netx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/memory.h + * arch/arm/mach-netx/include/mach/memory.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h index fc9aa21f360c..5104a00d40f4 100644 --- a/include/asm-arm/arch-netx/netx-regs.h +++ b/arch/arm/mach-netx/include/mach/netx-regs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/netx-regs.h + * arch/arm/mach-netx/include/mach/netx-regs.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/param.h b/arch/arm/mach-netx/include/mach/param.h index 7a80c26178a8..a771459206aa 100644 --- a/include/asm-arm/arch-netx/param.h +++ b/arch/arm/mach-netx/include/mach/param.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/param.h + * arch/arm/mach-netx/include/mach/param.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/pfifo.h b/arch/arm/mach-netx/include/mach/pfifo.h index 4af2ee4a32c1..42c59068f8d8 100644 --- a/include/asm-arm/arch-netx/pfifo.h +++ b/arch/arm/mach-netx/include/mach/pfifo.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/pfifo.h + * arch/arm/mach-netx/include/mach/pfifo.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/system.h b/arch/arm/mach-netx/include/mach/system.h index 0624d87e1db8..27d8ef8e8e29 100644 --- a/include/asm-arm/arch-netx/system.h +++ b/arch/arm/mach-netx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/system.h + * arch/arm/mach-netx/include/mach/system.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * @@ -20,7 +20,7 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include "netx-regs.h" static inline void arch_idle(void) diff --git a/include/asm-arm/arch-netx/timex.h b/arch/arm/mach-netx/include/mach/timex.h index 7fdb42da0b40..1120dd0ba393 100644 --- a/include/asm-arm/arch-netx/timex.h +++ b/arch/arm/mach-netx/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/timex.h + * arch/arm/mach-netx/include/mach/timex.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/uncompress.h b/arch/arm/mach-netx/include/mach/uncompress.h index f89434547102..84f91284f612 100644 --- a/include/asm-arm/arch-netx/uncompress.h +++ b/arch/arm/mach-netx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/uncompress.h + * arch/arm/mach-netx/include/mach/uncompress.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/vmalloc.h b/arch/arm/mach-netx/include/mach/vmalloc.h index da2da5a595da..25d5cc676e0f 100644 --- a/include/asm-arm/arch-netx/vmalloc.h +++ b/arch/arm/mach-netx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/vmalloc.h + * arch/arm/mach-netx/include/mach/vmalloc.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/xc.h b/arch/arm/mach-netx/include/mach/xc.h index 659af19512a9..0c0011d4fc2d 100644 --- a/include/asm-arm/arch-netx/xc.h +++ b/arch/arm/mach-netx/include/mach/xc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/xc.h + * arch/arm/mach-netx/include/mach/xc.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-ns9xxx/board.h b/arch/arm/mach-ns9xxx/include/mach/board.h index e57443bdbbd9..f7e9196eb9ab 100644 --- a/include/asm-arm/arch-ns9xxx/board.h +++ b/arch/arm/mach-ns9xxx/include/mach/board.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/board.h + * arch/arm/mach-ns9xxx/include/mach/board.h * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S index c78908d7203d..c9530fba00aa 100644 --- a/include/asm-arm/arch-ns9xxx/debug-macro.S +++ b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/debug-macro.S + * arch/arm/mach-ns9xxx/include/mach/debug-macro.S * Copyright (C) 2006 by Digi International Inc. * All rights reserved. * @@ -7,9 +7,9 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> -#include <asm/arch/regs-board-a9m9750dev.h> +#include <mach/regs-board-a9m9750dev.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-ns9xxx/dma.h b/arch/arm/mach-ns9xxx/include/mach/dma.h index a67cbbe009c4..3f50d8c9e5c7 100644 --- a/include/asm-arm/arch-ns9xxx/dma.h +++ b/arch/arm/mach-ns9xxx/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/dma.h + * arch/arm/mach-ns9xxx/include/mach/dma.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/entry-macro.S b/arch/arm/mach-ns9xxx/include/mach/entry-macro.S index e9d9449d300a..71ca0319b547 100644 --- a/include/asm-arm/arch-ns9xxx/entry-macro.S +++ b/arch/arm/mach-ns9xxx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/entry-macro.S + * arch/arm/mach-ns9xxx/include/mach/entry-macro.S * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. @@ -8,8 +8,8 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#include <asm/arch/hardware.h> -#include <asm/arch/regs-sys-common.h> +#include <mach/hardware.h> +#include <mach/regs-sys-common.h> .macro get_irqnr_preamble, base, tmp ldr \base, =SYS_ISRADDR diff --git a/include/asm-arm/arch-ns9xxx/gpio.h b/arch/arm/mach-ns9xxx/include/mach/gpio.h index adbca08583c0..5eb349032579 100644 --- a/include/asm-arm/arch-ns9xxx/gpio.h +++ b/arch/arm/mach-ns9xxx/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/gpio.h + * arch/arm/mach-ns9xxx/include/mach/gpio.h * * Copyright (C) 2007 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/arch/arm/mach-ns9xxx/include/mach/hardware.h index 0dca11ce21fc..6dbb2030f563 100644 --- a/include/asm-arm/arch-ns9xxx/hardware.h +++ b/arch/arm/mach-ns9xxx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/hardware.h + * arch/arm/mach-ns9xxx/include/mach/hardware.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/io.h b/arch/arm/mach-ns9xxx/include/mach/io.h index 6f82d28af120..027bf649645a 100644 --- a/include/asm-arm/arch-ns9xxx/io.h +++ b/arch/arm/mach-ns9xxx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/io.h + * arch/arm/mach-ns9xxx/include/mach/io.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/irqs.h b/arch/arm/mach-ns9xxx/include/mach/irqs.h index e83d48ec42c9..13483949e210 100644 --- a/include/asm-arm/arch-ns9xxx/irqs.h +++ b/arch/arm/mach-ns9xxx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/irqs.h + * arch/arm/mach-ns9xxx/include/mach/irqs.h * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h index ce1343e593e1..649ee6235b94 100644 --- a/include/asm-arm/arch-ns9xxx/memory.h +++ b/arch/arm/mach-ns9xxx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/memory.h + * arch/arm/mach-ns9xxx/include/mach/memory.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/module.h b/arch/arm/mach-ns9xxx/include/mach/module.h index ac08a31111e4..f851a6b7da6c 100644 --- a/include/asm-arm/arch-ns9xxx/module.h +++ b/arch/arm/mach-ns9xxx/include/mach/module.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/module.h + * arch/arm/mach-ns9xxx/include/mach/module.h * * Copyright (C) 2007 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/processor-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h index f3aa6c50dbe5..f41deda5129e 100644 --- a/include/asm-arm/arch-ns9xxx/processor-ns9360.h +++ b/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/processor-ns9360.h + * arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h * * Copyright (C) 2007 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/processor.h b/arch/arm/mach-ns9xxx/include/mach/processor.h index 3137e5ba01a9..9f77f746a386 100644 --- a/include/asm-arm/arch-ns9xxx/processor.h +++ b/arch/arm/mach-ns9xxx/include/mach/processor.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/processor.h + * arch/arm/mach-ns9xxx/include/mach/processor.h * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_PROCESSOR_H #define __ASM_ARCH_PROCESSOR_H -#include <asm/arch/module.h> +#include <mach/module.h> #define processor_is_ns9210() (0 \ || module_is_cc7ucamry() \ diff --git a/include/asm-arm/arch-ns9xxx/regs-bbu.h b/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h index b41b31d04f03..af227c058fb9 100644 --- a/include/asm-arm/arch-ns9xxx/regs-bbu.h +++ b/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/regs-bbu.h + * arch/arm/mach-ns9xxx/include/mach/regs-bbu.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_REGSBBU_H #define __ASM_ARCH_REGSBBU_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* BBus Utility */ diff --git a/include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h b/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h index 6bf1ed2ac3d2..cd1593693f56 100644 --- a/include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h +++ b/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h + * arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_REGSBOARDA9M9750_H #define __ASM_ARCH_REGSBOARDA9M9750_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define FPGA_UARTA_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0)) #define FPGA_UARTB_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x08) diff --git a/include/asm-arm/arch-ns9xxx/regs-mem.h b/arch/arm/mach-ns9xxx/include/mach/regs-mem.h index 023f7be6f4c6..f1625bf8cdce 100644 --- a/include/asm-arm/arch-ns9xxx/regs-mem.h +++ b/arch/arm/mach-ns9xxx/include/mach/regs-mem.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/regs-mem.h + * arch/arm/mach-ns9xxx/include/mach/regs-mem.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_REGSMEM_H #define __ASM_ARCH_REGSMEM_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* Memory Module */ diff --git a/include/asm-arm/arch-ns9xxx/regs-sys-common.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h index bc82d5ec2a88..14f91dfd5736 100644 --- a/include/asm-arm/arch-ns9xxx/regs-sys-common.h +++ b/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/regs-sys-common.h + * arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h * * Copyright (C) 2007 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_REGSSYSCOMMON_H #define __ASM_ARCH_REGSSYSCOMMON_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* Interrupt Vector Address Register Level x */ #define SYS_IVA(x) __REG2(0xa09000c4, (x)) diff --git a/include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h index 821275a88cb1..8ff254d9901c 100644 --- a/include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h +++ b/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h + * arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_REGSSYSNS9360_H #define __ASM_ARCH_REGSSYSNS9360_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* System Control Module */ diff --git a/include/asm-arm/arch-ns9xxx/system.h b/arch/arm/mach-ns9xxx/include/mach/system.h index c2941684d667..e2068c57415f 100644 --- a/include/asm-arm/arch-ns9xxx/system.h +++ b/arch/arm/mach-ns9xxx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/system.h + * arch/arm/mach-ns9xxx/include/mach/system.h * * Copyright (C) 2006,2007 by Digi International Inc. * All rights reserved. @@ -12,8 +12,8 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/proc-fns.h> -#include <asm/arch/processor.h> -#include <asm/arch/processor-ns9360.h> +#include <mach/processor.h> +#include <mach/processor-ns9360.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-ns9xxx/timex.h b/arch/arm/mach-ns9xxx/include/mach/timex.h index f776cbd2622d..734a8d8bd578 100644 --- a/include/asm-arm/arch-ns9xxx/timex.h +++ b/arch/arm/mach-ns9xxx/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/timex.h + * arch/arm/mach-ns9xxx/include/mach/timex.h * * Copyright (C) 2005-2006 by Digi International Inc. * All rights reserved. @@ -12,7 +12,7 @@ #define __ASM_ARCH_TIMEX_H /* - * value for CLOCK_TICK_RATE stolen from include/asm-arm/arch-s3c2410/timex.h. + * value for CLOCK_TICK_RATE stolen from arch/arm/mach-s3c2410/include/mach/timex.h. * See there for an explanation. */ #define CLOCK_TICK_RATE 12000000 diff --git a/include/asm-arm/arch-ns9xxx/uncompress.h b/arch/arm/mach-ns9xxx/include/mach/uncompress.h index 71066baceab7..5dbc3c5167c8 100644 --- a/include/asm-arm/arch-ns9xxx/uncompress.h +++ b/arch/arm/mach-ns9xxx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/uncompress.h + * arch/arm/mach-ns9xxx/include/mach/uncompress.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-ns9xxx/vmalloc.h b/arch/arm/mach-ns9xxx/include/mach/vmalloc.h index 2f3cb6f6be24..fe964d3bcc47 100644 --- a/include/asm-arm/arch-ns9xxx/vmalloc.h +++ b/arch/arm/mach-ns9xxx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ns9xxx/vmalloc.h + * arch/arm/mach-ns9xxx/include/mach/vmalloc.h * * Copyright (C) 2006 by Digi International Inc. * All rights reserved. diff --git a/include/asm-arm/arch-orion5x/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S index 4f98f3ba2929..c7f808bfe272 100644 --- a/include/asm-arm/arch-orion5x/debug-macro.S +++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/debug-macro.S + * arch/arm/mach-orion5x/include/mach/debug-macro.S * * Debugging macro include header * @@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-orion5x/dma.h b/arch/arm/mach-orion5x/include/mach/dma.h index 40a8c178f10d..40a8c178f10d 100644 --- a/include/asm-arm/arch-orion5x/dma.h +++ b/arch/arm/mach-orion5x/include/mach/dma.h diff --git a/include/asm-arm/arch-orion5x/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S index d8ef54c0ee9a..4351937035cd 100644 --- a/include/asm-arm/arch-orion5x/entry-macro.S +++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/entry-macro.S + * arch/arm/mach-orion5x/include/mach/entry-macro.S * * Low-level IRQ helper macros for Orion platforms * @@ -8,7 +8,7 @@ * warranty of any kind, whether express or implied. */ -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-orion5x/gpio.h b/arch/arm/mach-orion5x/include/mach/gpio.h index c85e498388b6..65dc136a86f7 100644 --- a/include/asm-arm/arch-orion5x/gpio.h +++ b/arch/arm/mach-orion5x/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/gpio.h + * arch/arm/mach-orion5x/include/mach/gpio.h * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/asm-arm/arch-orion5x/hardware.h b/arch/arm/mach-orion5x/include/mach/hardware.h index 5d2d8e0b5630..e51aaf4bf2b5 100644 --- a/include/asm-arm/arch-orion5x/hardware.h +++ b/arch/arm/mach-orion5x/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/hardware.h + * arch/arm/mach-orion5x/include/mach/hardware.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/include/asm-arm/arch-orion5x/io.h b/arch/arm/mach-orion5x/include/mach/io.h index 59f1bc96a23b..f24b2513f7f3 100644 --- a/include/asm-arm/arch-orion5x/io.h +++ b/arch/arm/mach-orion5x/include/mach/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/io.h + * arch/arm/mach-orion5x/include/mach/io.h * * Tzachi Perelstein <tzachi@marvell.com> * diff --git a/include/asm-arm/arch-orion5x/irqs.h b/arch/arm/mach-orion5x/include/mach/irqs.h index abdd61a4833a..d5b0fbf6b965 100644 --- a/include/asm-arm/arch-orion5x/irqs.h +++ b/arch/arm/mach-orion5x/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/irqs.h + * arch/arm/mach-orion5x/include/mach/irqs.h * * IRQ definitions for Orion SoC * diff --git a/include/asm-arm/arch-orion5x/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h index 80053a7afc7a..54dd76b013f2 100644 --- a/include/asm-arm/arch-orion5x/memory.h +++ b/arch/arm/mach-orion5x/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/memory.h + * arch/arm/mach-orion5x/include/mach/memory.h * * Marvell Orion memory definitions */ diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index 10257f5c5e9e..f52a7d65bec2 100644 --- a/include/asm-arm/arch-orion5x/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/orion5x.h + * arch/arm/mach-orion5x/include/mach/orion5x.h * * Generic definitions of Orion SoC flavors: * Orion-1, Orion-VoIP, Orion-NAS, and Orion-2. diff --git a/include/asm-arm/arch-orion5x/system.h b/arch/arm/mach-orion5x/include/mach/system.h index 3f1d1e2d38f8..08e430757890 100644 --- a/include/asm-arm/arch-orion5x/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/system.h + * arch/arm/mach-orion5x/include/mach/system.h * * Tzachi Perelstein <tzachi@marvell.com> * @@ -11,8 +11,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <asm/arch/hardware.h> -#include <asm/arch/orion5x.h> +#include <mach/hardware.h> +#include <mach/orion5x.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-orion5x/timex.h b/arch/arm/mach-orion5x/include/mach/timex.h index 31c568e28cc3..e82e44db7629 100644 --- a/include/asm-arm/arch-orion5x/timex.h +++ b/arch/arm/mach-orion5x/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/timex.h + * arch/arm/mach-orion5x/include/mach/timex.h * * Tzachi Perelstein <tzachi@marvell.com> * diff --git a/include/asm-arm/arch-orion5x/uncompress.h b/arch/arm/mach-orion5x/include/mach/uncompress.h index 7548cedf2d76..4322dba468a4 100644 --- a/include/asm-arm/arch-orion5x/uncompress.h +++ b/arch/arm/mach-orion5x/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-orion5x/uncompress.h + * arch/arm/mach-orion5x/include/mach/uncompress.h * * Tzachi Perelstein <tzachi@marvell.com> * @@ -9,7 +9,7 @@ */ #include <linux/serial_reg.h> -#include <asm/arch/orion5x.h> +#include <mach/orion5x.h> #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) 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> * 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 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. diff --git a/include/asm-arm/arch-rpc/acornfb.h b/arch/arm/mach-rpc/include/mach/acornfb.h index ecb7733a0949..395d76288ffe 100644 --- a/include/asm-arm/arch-rpc/acornfb.h +++ b/arch/arm/mach-rpc/include/mach/acornfb.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/acornfb.h + * arch/arm/mach-rpc/include/mach/acornfb.h * * Copyright (C) 1999 Russell King * diff --git a/include/asm-arm/arch-rpc/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S index c634c8d8f4a1..b2a939ffdcde 100644 --- a/include/asm-arm/arch-rpc/debug-macro.S +++ b/arch/arm/mach-rpc/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-rpc/debug-macro.S +/* arch/arm/mach-rpc/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-rpc/dma.h b/arch/arm/mach-rpc/include/mach/dma.h index d24a27e30b93..360b56f8f29f 100644 --- a/include/asm-arm/arch-rpc/dma.h +++ b/arch/arm/mach-rpc/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/dma.h + * arch/arm/mach-rpc/include/mach/dma.h * * Copyright (C) 1997 Russell King * diff --git a/include/asm-arm/arch-cl7500/entry-macro.S b/arch/arm/mach-rpc/include/mach/entry-macro.S index 5bd55557ccca..4e7e54144093 100644 --- a/include/asm-arm/arch-cl7500/entry-macro.S +++ b/arch/arm/mach-rpc/include/mach/entry-macro.S @@ -1,4 +1,4 @@ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/entry-macro-iomd.S> .equ ioc_base_high, IOC_BASE & 0xff000000 diff --git a/include/asm-arm/arch-rpc/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h index 7480f4e8d974..dde6b3c0e299 100644 --- a/include/asm-arm/arch-rpc/hardware.h +++ b/arch/arm/mach-rpc/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/hardware.h + * arch/arm/mach-rpc/include/mach/hardware.h * * Copyright (C) 1996-1999 Russell King. * @@ -12,7 +12,7 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include <asm/arch/memory.h> +#include <mach/memory.h> #ifndef __ASSEMBLY__ #define IOMEM(x) ((void __iomem *)(unsigned long)(x)) diff --git a/include/asm-arm/arch-rpc/io.h b/arch/arm/mach-rpc/include/mach/io.h index 0d10d4591a45..9f0553b7ec28 100644 --- a/include/asm-arm/arch-rpc/io.h +++ b/arch/arm/mach-rpc/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/io.h + * arch/arm/mach-rpc/include/mach/io.h * * Copyright (C) 1997 Russell King * @@ -13,7 +13,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-rpc/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h index 27c35b05b27d..4ce6ca97f669 100644 --- a/include/asm-arm/arch-rpc/irqs.h +++ b/arch/arm/mach-rpc/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/irqs.h + * arch/arm/mach-rpc/include/mach/irqs.h * * Copyright (C) 1996 Russell King * diff --git a/include/asm-arm/arch-rpc/memory.h b/arch/arm/mach-rpc/include/mach/memory.h index 303c424ce673..05425d558ee7 100644 --- a/include/asm-arm/arch-rpc/memory.h +++ b/arch/arm/mach-rpc/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/memory.h + * arch/arm/mach-rpc/include/mach/memory.h * * Copyright (C) 1996,1997,1998 Russell King. * diff --git a/include/asm-arm/arch-rpc/system.h b/arch/arm/mach-rpc/include/mach/system.h index ca3277d1d5ea..54d6e3f2d319 100644 --- a/include/asm-arm/arch-rpc/system.h +++ b/arch/arm/mach-rpc/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/system.h + * arch/arm/mach-rpc/include/mach/system.h * * Copyright (C) 1996-1999 Russell King. * @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iomd.h> #include <asm/io.h> diff --git a/include/asm-arm/arch-rpc/timex.h b/arch/arm/mach-rpc/include/mach/timex.h index ed7df64d960b..dd75e7387bbe 100644 --- a/include/asm-arm/arch-rpc/timex.h +++ b/arch/arm/mach-rpc/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/timex.h + * arch/arm/mach-rpc/include/mach/timex.h * * Copyright (C) 1997, 1998 Russell King * diff --git a/include/asm-arm/arch-rpc/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index 844e4d469fb2..baa9c866d7bf 100644 --- a/include/asm-arm/arch-rpc/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/uncompress.h + * arch/arm/mach-rpc/include/mach/uncompress.h * * Copyright (C) 1996 Russell King * @@ -9,7 +9,7 @@ */ #define VIDMEM ((char *)SCREEN_START) -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/setup.h> #include <asm/page.h> diff --git a/include/asm-arm/arch-rpc/vmalloc.h b/arch/arm/mach-rpc/include/mach/vmalloc.h index 077046bb2f36..9a96fd69e705 100644 --- a/include/asm-arm/arch-rpc/vmalloc.h +++ b/arch/arm/mach-rpc/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-rpc/vmalloc.h + * arch/arm/mach-rpc/include/mach/vmalloc.h * * Copyright (C) 1997 Russell King * diff --git a/include/asm-arm/arch-s3c2400/map.h b/arch/arm/mach-s3c2400/include/mach/map.h index 1184d907b31e..1535540edc82 100644 --- a/include/asm-arm/arch-s3c2400/map.h +++ b/arch/arm/mach-s3c2400/include/mach/map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2400/map.h +/* arch/arm/mach-s3c2400/include/mach/map.h * * Copyright 2003,2007 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2400/memory.h b/arch/arm/mach-s3c2400/include/mach/memory.h index fb0381dde704..8f4878e4f591 100644 --- a/include/asm-arm/arch-s3c2400/memory.h +++ b/arch/arm/mach-s3c2400/include/mach/memory.h @@ -1,5 +1,5 @@ -/* linux/include/asm-arm/arch-s3c2400/memory.h - * from linux/include/asm-arm/arch-rpc/memory.h +/* arch/arm/mach-s3c2400/include/mach/memory.h + * from arch/arm/mach-rpc/include/mach/memory.h * * Copyright 2007 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h b/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h index 168b93fee529..1b614d5a81f3 100644 --- a/include/asm-arm/arch-s3c2410/anubis-cpld.h +++ b/arch/arm/mach-s3c2410/include/mach/anubis-cpld.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/anubis-cpld.h +/* arch/arm/mach-s3c2410/include/mach/anubis-cpld.h * * Copyright (c) 2005 Simtec Electronics * http://www.simtec.co.uk/products/ diff --git a/include/asm-arm/arch-s3c2410/anubis-irq.h b/arch/arm/mach-s3c2410/include/mach/anubis-irq.h index cd77a70d45c0..a2a328134e34 100644 --- a/include/asm-arm/arch-s3c2410/anubis-irq.h +++ b/arch/arm/mach-s3c2410/include/mach/anubis-irq.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/anubis-irq.h +/* arch/arm/mach-s3c2410/include/mach/anubis-irq.h * * Copyright (c) 2005 Simtec Electronics * http://www.simtec.co.uk/products/ diff --git a/include/asm-arm/arch-s3c2410/anubis-map.h b/arch/arm/mach-s3c2410/include/mach/anubis-map.h index 830d114261da..c9deb3a5b2c3 100644 --- a/include/asm-arm/arch-s3c2410/anubis-map.h +++ b/arch/arm/mach-s3c2410/include/mach/anubis-map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/anubis-map.h +/* arch/arm/mach-s3c2410/include/mach/anubis-map.h * * Copyright (c) 2005 Simtec Electronics * http://www.simtec.co.uk/products/ diff --git a/include/asm-arm/arch-s3c2410/audio.h b/arch/arm/mach-s3c2410/include/mach/audio.h index 0a6977fb5770..de0e8da48bc3 100644 --- a/include/asm-arm/arch-s3c2410/audio.h +++ b/arch/arm/mach-s3c2410/include/mach/audio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/audio.h +/* arch/arm/mach-s3c2410/include/mach/audio.h * * Copyright (c) 2004-2005 Simtec Electronics * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/bast-cpld.h b/arch/arm/mach-s3c2410/include/mach/bast-cpld.h index 034d2c5a47c4..20493b048360 100644 --- a/include/asm-arm/arch-s3c2410/bast-cpld.h +++ b/arch/arm/mach-s3c2410/include/mach/bast-cpld.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/bast-cpld.h +/* arch/arm/mach-s3c2410/include/mach/bast-cpld.h * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/bast-irq.h b/arch/arm/mach-s3c2410/include/mach/bast-irq.h index 726c0466f85a..501c202b53cf 100644 --- a/include/asm-arm/arch-s3c2410/bast-irq.h +++ b/arch/arm/mach-s3c2410/include/mach/bast-irq.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/bast-irq.h +/* arch/arm/mach-s3c2410/include/mach/bast-irq.h * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/bast-map.h b/arch/arm/mach-s3c2410/include/mach/bast-map.h index 86ac1c108db8..c2c5baf07345 100644 --- a/include/asm-arm/arch-s3c2410/bast-map.h +++ b/arch/arm/mach-s3c2410/include/mach/bast-map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/bast-map.h +/* arch/arm/mach-s3c2410/include/mach/bast-map.h * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/bast-pmu.h b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h index 37a11fe54a78..61684cb8ce59 100644 --- a/include/asm-arm/arch-s3c2410/bast-pmu.h +++ b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/bast-pmu.h +/* arch/arm/mach-s3c2410/include/mach/bast-pmu.h * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/arch/arm/mach-s3c2410/include/mach/debug-macro.S index 89076c322726..682df23087ab 100644 --- a/include/asm-arm/arch-s3c2410/debug-macro.S +++ b/arch/arm/mach-s3c2410/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/debug-macro.S +/* arch/arm/mach-s3c2410/include/mach/debug-macro.S * * Debugging macro include header * @@ -12,8 +12,8 @@ * published by the Free Software Foundation. */ -#include <asm/arch/map.h> -#include <asm/arch/regs-gpio.h> +#include <mach/map.h> +#include <mach/regs-gpio.h> #include <asm/plat-s3c/regs-serial.h> #define S3C2410_UART1_OFF (0x4000) diff --git a/include/asm-arm/arch-s3c2410/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h index 86eaa0c2dc1e..891b53cd69b8 100644 --- a/include/asm-arm/arch-s3c2410/dma.h +++ b/arch/arm/mach-s3c2410/include/mach/dma.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/dma.h +/* arch/arm/mach-s3c2410/include/mach/dma.h * * Copyright (C) 2003,2004,2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -14,7 +14,7 @@ #define __ASM_ARCH_DMA_H __FILE__ #include <linux/sysdev.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * This is the maximum DMA address(physical address) that can be DMAd to. diff --git a/include/asm-arm/arch-s3c2410/entry-macro.S b/arch/arm/mach-s3c2410/include/mach/entry-macro.S index f70d051b267b..473b3cd37d9b 100644 --- a/include/asm-arm/arch-s3c2410/entry-macro.S +++ b/arch/arm/mach-s3c2410/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-s3c2410/entry-macro.S + * arch/arm/mach-s3c2410/include/mach/entry-macro.S * * Low-level IRQ helper macros for S3C2410-based platforms * @@ -19,7 +19,7 @@ #define INTPND (0x10) #define INTOFFSET (0x14) -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> .macro get_irqnr_preamble, base, tmp diff --git a/include/asm-arm/arch-s3c2410/fb.h b/arch/arm/mach-s3c2410/include/mach/fb.h index 5d0262601a7e..eee0654eb8fb 100644 --- a/include/asm-arm/arch-s3c2410/fb.h +++ b/arch/arm/mach-s3c2410/include/mach/fb.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/fb.h +/* arch/arm/mach-s3c2410/include/mach/fb.h * * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> * @@ -12,7 +12,7 @@ #ifndef __ASM_ARM_FB_H #define __ASM_ARM_FB_H -#include <asm/arch/regs-lcd.h> +#include <mach/regs-lcd.h> struct s3c2410fb_hw { unsigned long lcdcon1; diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 18e10d2c35ea..3b52b86498a6 100644 --- a/include/asm-arm/arch-s3c2410/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/gpio.h +/* arch/arm/mach-s3c2410/include/mach/gpio.h * * Copyright (c) 2008 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h index c3de5ab102eb..d8a832729a8a 100644 --- a/include/asm-arm/arch-s3c2410/h1940-latch.h +++ b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/h1940-latch.h +/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h * * Copyright (c) 2005 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/h1940.h b/arch/arm/mach-s3c2410/include/mach/h1940.h index 6135592e60f2..4559784129c0 100644 --- a/include/asm-arm/arch-s3c2410/h1940.h +++ b/arch/arm/mach-s3c2410/include/mach/h1940.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/h1940.h +/* arch/arm/mach-s3c2410/include/mach/h1940.h * * Copyright 2006 Ben Dooks <ben-linux@fluff.org> * diff --git a/include/asm-arm/arch-s3c2410/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h index 6dd10be43145..74d5a1a4024c 100644 --- a/include/asm-arm/arch-s3c2410/hardware.h +++ b/arch/arm/mach-s3c2410/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/hardware.h +/* arch/arm/mach-s3c2410/include/mach/hardware.h * * Copyright (c) 2003 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -127,7 +127,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state); #endif /* __ASSEMBLY__ */ #include <asm/sizes.h> -#include <asm/arch/map.h> +#include <mach/map.h> /* machine specific hardware definitions should go after this */ diff --git a/include/asm-arm/arch-s3c2410/idle.h b/arch/arm/mach-s3c2410/include/mach/idle.h index eed450608f9c..e9ddd706b16e 100644 --- a/include/asm-arm/arch-s3c2410/idle.h +++ b/arch/arm/mach-s3c2410/include/mach/idle.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/idle.h +/* arch/arm/mach-s3c2410/include/mach/idle.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/io.h b/arch/arm/mach-s3c2410/include/mach/io.h index 3756c993776c..9813dbf2ae4f 100644 --- a/include/asm-arm/arch-s3c2410/io.h +++ b/arch/arm/mach-s3c2410/include/mach/io.h @@ -1,6 +1,6 @@ /* - * linux/include/asm-arm/arch-s3c2410/io.h - * from linux/include/asm-arm/arch-rpc/io.h + * arch/arm/mach-s3c2410/include/mach/io.h + * from arch/arm/mach-rpc/include/mach/io.h * * Copyright (C) 1997 Russell King * (C) 2003 Simtec Electronics @@ -9,7 +9,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-s3c2410/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h index f5435d8c3769..950c71bf1489 100644 --- a/include/asm-arm/arch-s3c2410/irqs.h +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/irqs.h +/* arch/arm/mach-s3c2410/include/mach/irqs.h * * Copyright (c) 2003-2005 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h b/arch/arm/mach-s3c2410/include/mach/leds-gpio.h index 800846ebddba..d8a7672519b6 100644 --- a/include/asm-arm/arch-s3c2410/leds-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/leds-gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h +/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h * * Copyright (c) 2006 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/map.h b/arch/arm/mach-s3c2410/include/mach/map.h index b33ed3b05ef5..64bf7e94a5bf 100644 --- a/include/asm-arm/arch-s3c2410/map.h +++ b/arch/arm/mach-s3c2410/include/mach/map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/map.h +/* arch/arm/mach-s3c2410/include/mach/map.h * * Copyright (c) 2003 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h index 533e2436e707..93782628a786 100644 --- a/include/asm-arm/arch-s3c2410/memory.h +++ b/arch/arm/mach-s3c2410/include/mach/memory.h @@ -1,5 +1,5 @@ -/* linux/include/asm-arm/arch-s3c2410/memory.h - * from linux/include/asm-arm/arch-rpc/memory.h +/* arch/arm/mach-s3c2410/include/mach/memory.h + * from arch/arm/mach-rpc/include/mach/memory.h * * Copyright (C) 1996,1997,1998 Russell King. * diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h index 229ab2351db6..e9e36b0abbac 100644 --- a/include/asm-arm/arch-s3c2410/osiris-cpld.h +++ b/arch/arm/mach-s3c2410/include/mach/osiris-cpld.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h +/* arch/arm/mach-s3c2410/include/mach/osiris-cpld.h * * Copyright 2005 Simtec Electronics * http://www.simtec.co.uk/products/ diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/arch/arm/mach-s3c2410/include/mach/osiris-map.h index b5c74d2b9aaa..639eff523d4e 100644 --- a/include/asm-arm/arch-s3c2410/osiris-map.h +++ b/arch/arm/mach-s3c2410/include/mach/osiris-map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/osiris-map.h +/* arch/arm/mach-s3c2410/include/mach/osiris-map.h * * (c) 2005 Simtec Electronics * http://www.simtec.co.uk/products/ diff --git a/include/asm-arm/arch-s3c2410/otom-map.h b/arch/arm/mach-s3c2410/include/mach/otom-map.h index e40c93429854..f9277a52c145 100644 --- a/include/asm-arm/arch-s3c2410/otom-map.h +++ b/arch/arm/mach-s3c2410/include/mach/otom-map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/otom-map.h +/* arch/arm/mach-s3c2410/include/mach/otom-map.h * * (c) 2005 Guillaume GOURAT / NexVision * guillaume.gourat@nexvision.fr diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-clock.h index 37661358b42b..d583688458a4 100644 --- a/include/asm-arm/arch-s3c2410/regs-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-clock.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-clock.h +/* arch/arm/mach-s3c2410/include/mach/regs-clock.h * * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/arch/arm/mach-s3c2410/include/mach/regs-dsc.h index 1235df70f34e..3c3853cd3cf7 100644 --- a/include/asm-arm/arch-s3c2410/regs-dsc.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-dsc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h +/* arch/arm/mach-s3c2410/include/mach/regs-dsc.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h index 497dd06e2c99..30bec027f5fa 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h +/* arch/arm/mach-s3c2410/include/mach/regs-gpio.h * * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h index 0362332faaf0..1202ca5e99f6 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpioj.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpioj.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h +/* arch/arm/mach-s3c2410/include/mach/regs-gpioj.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-irq.h b/arch/arm/mach-s3c2410/include/mach/regs-irq.h index 498184cb8adc..b057c06d167a 100644 --- a/include/asm-arm/arch-s3c2410/regs-irq.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-irq.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-irq.h +/* arch/arm/mach-s3c2410/include/mach/regs-irq.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h index bd854845697f..893b8742f954 100644 --- a/include/asm-arm/arch-s3c2410/regs-lcd.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-lcd.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h +/* arch/arm/mach-s3c2410/include/mach/regs-lcd.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-mem.h index 312ff93b63c6..f9926abd5cde 100644 --- a/include/asm-arm/arch-s3c2410/regs-mem.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-mem.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-mem.h +/* arch/arm/mach-s3c2410/include/mach/regs-mem.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-power.h b/arch/arm/mach-s3c2410/include/mach/regs-power.h index 13d13b7cfe98..2d36353f57d7 100644 --- a/include/asm-arm/arch-s3c2410/regs-power.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-power.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-power.h +/* arch/arm/mach-s3c2410/include/mach/regs-power.h * * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h index c8c793e78936..a4bf27123170 100644 --- a/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h * * Copyright (c) 2008 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2412.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h index 783b18f5bcea..aa69dc79bc38 100644 --- a/include/asm-arm/arch-s3c2410/regs-s3c2412.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412.h +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h * * Copyright 2007 Simtec Electronics * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index c1414658d1c5..7dd458363a51 100644 --- a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h * * Copyright (c) 2007 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h index bfb222fa4abb..cbf2d8884e30 100644 --- a/include/asm-arm/arch-s3c2410/regs-sdi.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h +/* arch/arm/mach-s3c2410/include/mach/regs-sdi.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/reset.h b/arch/arm/mach-s3c2410/include/mach/reset.h index 4f866cdecab0..f8c9387b049d 100644 --- a/include/asm-arm/arch-s3c2410/reset.h +++ b/arch/arm/mach-s3c2410/include/mach/reset.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/reset.h +/* arch/arm/mach-s3c2410/include/mach/reset.h * * Copyright (c) 2007 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h index 73803731142a..3fe8be9ca110 100644 --- a/include/asm-arm/arch-s3c2410/spi-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h +/* arch/arm/mach-s3c2410/include/mach/spi-gpio.h * * Copyright (c) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/spi.h b/arch/arm/mach-s3c2410/include/mach/spi.h index 442169887d3b..921b13b4f0a0 100644 --- a/include/asm-arm/arch-s3c2410/spi.h +++ b/arch/arm/mach-s3c2410/include/mach/spi.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/spi.h +/* arch/arm/mach-s3c2410/include/mach/spi.h * * Copyright (c) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index beeec770dcf7..ec2defebf0d5 100644 --- a/include/asm-arm/arch-s3c2410/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/system-reset.h +/* arch/arm/mach-s3c2410/include/mach/system-reset.h * * Copyright (c) 2008 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -10,11 +10,11 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/plat-s3c/regs-watchdog.h> -#include <asm/arch/regs-clock.h> +#include <mach/regs-clock.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/include/asm-arm/arch-s3c2410/system.h b/arch/arm/mach-s3c2410/include/mach/system.h index 98f690e7d33e..e9f676bc0116 100644 --- a/include/asm-arm/arch-s3c2410/system.h +++ b/arch/arm/mach-s3c2410/include/mach/system.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/system.h +/* arch/arm/mach-s3c2410/include/mach/system.h * * Copyright (c) 2003 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -10,14 +10,14 @@ * published by the Free Software Foundation. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/map.h> -#include <asm/arch/idle.h> -#include <asm/arch/reset.h> +#include <mach/map.h> +#include <mach/idle.h> +#include <mach/reset.h> -#include <asm/arch/regs-clock.h> +#include <mach/regs-clock.h> void (*s3c24xx_idle)(void); void (*s3c24xx_reset_hook)(void); @@ -55,4 +55,4 @@ static void arch_idle(void) s3c24xx_default_idle(); } -#include <asm/arch/system-reset.h> +#include <mach/system-reset.h> diff --git a/include/asm-arm/arch-s3c2410/timex.h b/arch/arm/mach-s3c2410/include/mach/timex.h index c16a99c5a59a..2a425ed0a7e0 100644 --- a/include/asm-arm/arch-s3c2410/timex.h +++ b/arch/arm/mach-s3c2410/include/mach/timex.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/timex.h +/* arch/arm/mach-s3c2410/include/mach/timex.h * * Copyright (c) 2003-2005 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/arch/arm/mach-s3c2410/include/mach/uncompress.h index 48a5731ee988..708e47459ffc 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/arch/arm/mach-s3c2410/include/mach/uncompress.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/uncompress.h +/* arch/arm/mach-s3c2410/include/mach/uncompress.h * * Copyright (c) 2003, 2007 Simtec Electronics * http://armlinux.simtec.co.uk/ @@ -14,8 +14,8 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/arch/regs-gpio.h> -#include <asm/arch/map.h> +#include <mach/regs-gpio.h> +#include <mach/map.h> /* working in physical space... */ #undef S3C2410_GPIOREG diff --git a/include/asm-arm/arch-s3c2410/usb-control.h b/arch/arm/mach-s3c2410/include/mach/usb-control.h index 5bfa376e33dc..cd91d1591f31 100644 --- a/include/asm-arm/arch-s3c2410/usb-control.h +++ b/arch/arm/mach-s3c2410/include/mach/usb-control.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/usb-control.h +/* arch/arm/mach-s3c2410/include/mach/usb-control.h * * Copyright (c) 2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -11,7 +11,7 @@ */ #ifndef __ASM_ARCH_USBCONTROL_H -#define __ASM_ARCH_USBCONTROL_H "include/asm-arm/arch-s3c2410/usb-control.h" +#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h" #define S3C_HCDFLG_USED (1) diff --git a/include/asm-arm/arch-s3c2410/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h index 0ae3bdb7e03b..315b0078a34d 100644 --- a/include/asm-arm/arch-s3c2410/vmalloc.h +++ b/arch/arm/mach-s3c2410/include/mach/vmalloc.h @@ -1,6 +1,6 @@ -/* linux/include/asm-arm/arch-s3c2410/vmalloc.h +/* arch/arm/mach-s3c2410/include/mach/vmalloc.h * - * from linux/include/asm-arm/arch-iop3xx/vmalloc.h + * from arch/arm/mach-iop3xx/include/mach/vmalloc.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/vr1000-cpld.h b/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h index 0557b0a5ab1d..e4119913d7c5 100644 --- a/include/asm-arm/arch-s3c2410/vr1000-cpld.h +++ b/arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/vr1000-cpld.h +/* arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h * * Copyright (c) 2003 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/vr1000-irq.h b/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h index 890937083c61..f53f85b4ad8b 100644 --- a/include/asm-arm/arch-s3c2410/vr1000-irq.h +++ b/arch/arm/mach-s3c2410/include/mach/vr1000-irq.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/vr1000-irq.h +/* arch/arm/mach-s3c2410/include/mach/vr1000-irq.h * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-s3c2410/vr1000-map.h b/arch/arm/mach-s3c2410/include/mach/vr1000-map.h index 92a56a724a8c..99612fcc4eb2 100644 --- a/include/asm-arm/arch-s3c2410/vr1000-map.h +++ b/arch/arm/mach-s3c2410/include/mach/vr1000-map.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/vr1000-map.h +/* arch/arm/mach-s3c2410/include/mach/vr1000-map.h * * Copyright (c) 2003-2005 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_VR1000MAP_H #define __ASM_ARCH_VR1000MAP_H -#include <asm/arch/bast-map.h> +#include <mach/bast-map.h> #define VR1000_IOADDR(x) BAST_IOADDR(x) diff --git a/include/asm-arm/arch-sa1100/SA-1100.h b/arch/arm/mach-sa1100/include/mach/SA-1100.h index 62aaf04a3906..62aaf04a3906 100644 --- a/include/asm-arm/arch-sa1100/SA-1100.h +++ b/arch/arm/mach-sa1100/include/mach/SA-1100.h diff --git a/include/asm-arm/arch-sa1100/SA-1101.h b/arch/arm/mach-sa1100/include/mach/SA-1101.h index 65ca8c79e6d2..5d2ad7db991c 100644 --- a/include/asm-arm/arch-sa1100/SA-1101.h +++ b/arch/arm/mach-sa1100/include/mach/SA-1101.h @@ -38,7 +38,7 @@ #define SA1101_p2v(PhAdd) (PhAdd) #endif -#include <asm/arch/bitfield.h> +#include <mach/bitfield.h> #define C 0 #define Assembly 1 diff --git a/include/asm-arm/arch-sa1100/SA-1111.h b/arch/arm/mach-sa1100/include/mach/SA-1111.h index c38f60915cb6..c38f60915cb6 100644 --- a/include/asm-arm/arch-sa1100/SA-1111.h +++ b/arch/arm/mach-sa1100/include/mach/SA-1111.h diff --git a/include/asm-arm/arch-sa1100/assabet.h b/arch/arm/mach-sa1100/include/mach/assabet.h index d6a1bb5b4944..3959b20d5d1c 100644 --- a/include/asm-arm/arch-sa1100/assabet.h +++ b/arch/arm/mach-sa1100/include/mach/assabet.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/assabet.h + * arch/arm/mach-sa1100/include/mach/assabet.h * * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-sa1100/badge4.h b/arch/arm/mach-sa1100/include/mach/badge4.h index d93a9a83b25d..44d2e1bfc04b 100644 --- a/include/asm-arm/arch-sa1100/badge4.h +++ b/arch/arm/mach-sa1100/include/mach/badge4.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/badge4.h + * arch/arm/mach-sa1100/include/mach/badge4.h * * Tim Connors <connors@hpl.hp.com> * Christopher Hoover <ch@hpl.hp.com> @@ -13,7 +13,7 @@ */ #ifndef __ASM_ARCH_HARDWARE_H -#error "include <asm/arch/hardware.h> instead" +#error "include <mach/hardware.h> instead" #endif #define BADGE4_SA1111_BASE (0x48000000) diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/arch/arm/mach-sa1100/include/mach/bitfield.h index f1f0e3387d9c..f1f0e3387d9c 100644 --- a/include/asm-arm/arch-sa1100/bitfield.h +++ b/arch/arm/mach-sa1100/include/mach/bitfield.h diff --git a/include/asm-arm/arch-sa1100/cerf.h b/arch/arm/mach-sa1100/include/mach/cerf.h index 9a19c3d07c1e..c3ac3d0f9465 100644 --- a/include/asm-arm/arch-sa1100/cerf.h +++ b/arch/arm/mach-sa1100/include/mach/cerf.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-sa1100/cerf.h + * arch/arm/mach-sa1100/include/mach/cerf.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-sa1100/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h index 762eba535813..69e962416e3f 100644 --- a/include/asm-arm/arch-sa1100/collie.h +++ b/arch/arm/mach-sa1100/include/mach/collie.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/collie.h + * arch/arm/mach-sa1100/include/mach/collie.h * * This file contains the hardware specific definitions for Assabet * Only include this file from SA1100-specific files. diff --git a/include/asm-arm/arch-sa1100/debug-macro.S b/arch/arm/mach-sa1100/include/mach/debug-macro.S index 1b7753654bd4..1f0634d92702 100644 --- a/include/asm-arm/arch-sa1100/debug-macro.S +++ b/arch/arm/mach-sa1100/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-sa1100/debug-macro.S +/* arch/arm/mach-sa1100/include/mach/debug-macro.S * * Debugging macro include header * @@ -10,7 +10,7 @@ * published by the Free Software Foundation. * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 @@ -19,7 +19,7 @@ movne \rx, #0xf8000000 @ virtual address @ We probe for the active serial port here, coherently with - @ the comment in include/asm-arm/arch-sa1100/uncompress.h. + @ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h. @ We assume r1 can be clobbered. @ see if Ser3 is active diff --git a/include/asm-arm/arch-sa1100/dma.h b/arch/arm/mach-sa1100/include/mach/dma.h index 6b7917a2e77a..dda1b351310d 100644 --- a/include/asm-arm/arch-sa1100/dma.h +++ b/arch/arm/mach-sa1100/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/dma.h + * arch/arm/mach-sa1100/include/mach/dma.h * * Generic SA1100 DMA support * diff --git a/include/asm-arm/arch-sa1100/entry-macro.S b/arch/arm/mach-sa1100/include/mach/entry-macro.S index 127db4aaf4f2..6aa13c46c5d3 100644 --- a/include/asm-arm/arch-sa1100/entry-macro.S +++ b/arch/arm/mach-sa1100/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-sa1100/entry-macro.S + * arch/arm/mach-sa1100/include/mach/entry-macro.S * * Low-level IRQ helper macros for SA1100-based platforms * diff --git a/include/asm-arm/arch-sa1100/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h index e66ecf74e807..582a0c92da53 100644 --- a/include/asm-arm/arch-sa1100/gpio.h +++ b/arch/arm/mach-sa1100/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/gpio.h + * arch/arm/mach-sa1100/include/mach/gpio.h * * SA1100 GPIO wrappers for arch-neutral GPIO calls * @@ -24,7 +24,7 @@ #ifndef __ASM_ARCH_SA1100_GPIO_H #define __ASM_ARCH_SA1100_GPIO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm-generic/gpio.h> diff --git a/include/asm-arm/arch-sa1100/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h index 3ca0ecf095e6..3ca0ecf095e6 100644 --- a/include/asm-arm/arch-sa1100/h3600.h +++ b/arch/arm/mach-sa1100/include/mach/h3600.h diff --git a/include/asm-arm/arch-sa1100/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h index 62b0b7879685..62b0b7879685 100644 --- a/include/asm-arm/arch-sa1100/h3600_gpio.h +++ b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h diff --git a/include/asm-arm/arch-sa1100/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h index 1abd7cfc8bce..5976435f42c2 100644 --- a/include/asm-arm/arch-sa1100/hardware.h +++ b/arch/arm/mach-sa1100/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/hardware.h + * arch/arm/mach-sa1100/include/mach/hardware.h * * Copyright (C) 1998 Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-sa1100/ide.h b/arch/arm/mach-sa1100/include/mach/ide.h index 24972f30195a..4c99c8f5e617 100644 --- a/include/asm-arm/arch-sa1100/ide.h +++ b/arch/arm/mach-sa1100/include/mach/ide.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/ide.h + * arch/arm/mach-sa1100/include/mach/ide.h * * Copyright (c) 1998 Hugo Fiennes & Nicolas Pitre * @@ -10,7 +10,7 @@ */ #include <asm/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #error "This code is broken and needs update to match with current ide support" diff --git a/include/asm-arm/arch-sa1100/io.h b/arch/arm/mach-sa1100/include/mach/io.h index 0756269404b1..0c070a6149bc 100644 --- a/include/asm-arm/arch-sa1100/io.h +++ b/arch/arm/mach-sa1100/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/io.h + * arch/arm/mach-sa1100/include/mach/io.h * * Copyright (C) 1997-1999 Russell King * diff --git a/include/asm-arm/arch-sa1100/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h index 7bf80484bb77..0cb36609b3ac 100644 --- a/include/asm-arm/arch-sa1100/irqs.h +++ b/arch/arm/mach-sa1100/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/irqs.h + * arch/arm/mach-sa1100/include/mach/irqs.h * * Copyright (C) 1996 Russell King * Copyright (C) 1998 Deborah Wallach (updates for SA1100/Brutus). diff --git a/include/asm-arm/arch-sa1100/jornada720.h b/arch/arm/mach-sa1100/include/mach/jornada720.h index 45d2bb59f9d0..bc120850d313 100644 --- a/include/asm-arm/arch-sa1100/jornada720.h +++ b/arch/arm/mach-sa1100/include/mach/jornada720.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-sa1100/jornada720.h + * arch/arm/mach-sa1100/include/mach/jornada720.h * * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 * diff --git a/include/asm-arm/arch-sa1100/lart.h b/arch/arm/mach-sa1100/include/mach/lart.h index 8a5482d908db..8a5482d908db 100644 --- a/include/asm-arm/arch-sa1100/lart.h +++ b/arch/arm/mach-sa1100/include/mach/lart.h diff --git a/include/asm-arm/arch-sa1100/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h index f58a22755c61..fb8b09a57ad7 100644 --- a/include/asm-arm/arch-sa1100/mcp.h +++ b/arch/arm/mach-sa1100/include/mach/mcp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/mcp.h + * arch/arm/mach-sa1100/include/mach/mcp.h * * Copyright (C) 2005 Russell King. * diff --git a/include/asm-arm/arch-sa1100/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index 0e907fc6d42a..29f639e2afc6 100644 --- a/include/asm-arm/arch-sa1100/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/memory.h + * arch/arm/mach-sa1100/include/mach/memory.h * * Copyright (C) 1999-2000 Nicolas Pitre <nico@cam.org> */ diff --git a/include/asm-arm/arch-sa1100/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h index 80cfdac2b944..80cfdac2b944 100644 --- a/include/asm-arm/arch-sa1100/mtd-xip.h +++ b/arch/arm/mach-sa1100/include/mach/mtd-xip.h diff --git a/include/asm-arm/arch-sa1100/neponset.h b/arch/arm/mach-sa1100/include/mach/neponset.h index 09ec9e2bd182..d3f044f92c00 100644 --- a/include/asm-arm/arch-sa1100/neponset.h +++ b/arch/arm/mach-sa1100/include/mach/neponset.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/neponset.h + * arch/arm/mach-sa1100/include/mach/neponset.h * * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-sa1100/shannon.h b/arch/arm/mach-sa1100/include/mach/shannon.h index ec27d6e12140..ec27d6e12140 100644 --- a/include/asm-arm/arch-sa1100/shannon.h +++ b/arch/arm/mach-sa1100/include/mach/shannon.h diff --git a/include/asm-arm/arch-sa1100/simpad.h b/arch/arm/mach-sa1100/include/mach/simpad.h index 034301d23f60..9296c4513ce1 100644 --- a/include/asm-arm/arch-sa1100/simpad.h +++ b/arch/arm/mach-sa1100/include/mach/simpad.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/simpad.h + * arch/arm/mach-sa1100/include/mach/simpad.h * * based of assabet.h same as HUW_Webpanel * diff --git a/include/asm-arm/arch-sa1100/system.h b/arch/arm/mach-sa1100/include/mach/system.h index 63375a0c0145..63755ca5b1b4 100644 --- a/include/asm-arm/arch-sa1100/system.h +++ b/arch/arm/mach-sa1100/include/mach/system.h @@ -1,9 +1,9 @@ /* - * linux/include/asm-arm/arch-sa1100/system.h + * arch/arm/mach-sa1100/include/mach/system.h * * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/include/asm-arm/arch-sa1100/timex.h b/arch/arm/mach-sa1100/include/mach/timex.h index 837be9b797dd..7a5d017b58b3 100644 --- a/include/asm-arm/arch-sa1100/timex.h +++ b/arch/arm/mach-sa1100/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/timex.h + * arch/arm/mach-sa1100/include/mach/timex.h * * SA1100 architecture timex specifications * diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/arch/arm/mach-sa1100/include/mach/uncompress.h index 17e64d232e7d..714160b03d7a 100644 --- a/include/asm-arm/arch-sa1100/uncompress.h +++ b/arch/arm/mach-sa1100/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/uncompress.h + * arch/arm/mach-sa1100/include/mach/uncompress.h * * (C) 1999 Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-shark/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S index 7cb37f78825e..0836cb78b29a 100644 --- a/include/asm-arm/arch-shark/debug-macro.S +++ b/arch/arm/mach-shark/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-shark/debug-macro.S +/* arch/arm/mach-shark/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-shark/dma.h b/arch/arm/mach-shark/include/mach/dma.h index fc985d5e62af..c0a29bd2a74f 100644 --- a/include/asm-arm/arch-shark/dma.h +++ b/arch/arm/mach-shark/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-shark/dma.h + * arch/arm/mach-shark/include/mach/dma.h * * by Alexander Schulz */ diff --git a/include/asm-arm/arch-shark/entry-macro.S b/arch/arm/mach-shark/include/mach/entry-macro.S index 82463f30f3df..e2853c0a3333 100644 --- a/include/asm-arm/arch-shark/entry-macro.S +++ b/arch/arm/mach-shark/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-shark/entry-macro.S + * arch/arm/mach-shark/include/mach/entry-macro.S * * Low-level IRQ helper macros for Shark platform * diff --git a/include/asm-arm/arch-shark/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index ecba45260898..cb0ee2943c1a 100644 --- a/include/asm-arm/arch-shark/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h @@ -1,10 +1,10 @@ /* - * linux/include/asm-arm/arch-shark/hardware.h + * arch/arm/mach-shark/include/mach/hardware.h * * by Alexander Schulz * * derived from: - * linux/include/asm-arm/arch-ebsa110/hardware.h + * arch/arm/mach-ebsa110/include/mach/hardware.h * Copyright (C) 1996-1999 Russell King. */ #ifndef __ASM_ARCH_HARDWARE_H diff --git a/include/asm-arm/arch-shark/io.h b/arch/arm/mach-shark/include/mach/io.h index b11d7860a9d3..92475922c068 100644 --- a/include/asm-arm/arch-shark/io.h +++ b/arch/arm/mach-shark/include/mach/io.h @@ -1,17 +1,17 @@ /* - * linux/include/asm-arm/arch-shark/io.h + * arch/arm/mach-shark/include/mach/io.h * * by Alexander Schulz * * derived from: - * linux/include/asm-arm/arch-ebsa110/io.h + * arch/arm/mach-ebsa110/include/mach/io.h * Copyright (C) 1997,1998 Russell King */ #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-shark/irqs.h b/arch/arm/mach-shark/include/mach/irqs.h index b36cc975b290..0586acd7cdd5 100644 --- a/include/asm-arm/arch-shark/irqs.h +++ b/arch/arm/mach-shark/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-shark/irqs.h + * arch/arm/mach-shark/include/mach/irqs.h * * by Alexander Schulz */ diff --git a/include/asm-arm/arch-shark/memory.h b/arch/arm/mach-shark/include/mach/memory.h index 6968d6103ea0..b7874ad9f9f6 100644 --- a/include/asm-arm/arch-shark/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h @@ -1,10 +1,10 @@ /* - * linux/include/asm-arm/arch-shark/memory.h + * arch/arm/mach-shark/include/mach/memory.h * * by Alexander Schulz * * derived from: - * linux/include/asm-arm/arch-ebsa110/memory.h + * arch/arm/mach-ebsa110/include/mach/memory.h * Copyright (c) 1996-1999 Russell King. */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-shark/system.h b/arch/arm/mach-shark/include/mach/system.h index f12d771ab4ce..85aceef6f874 100644 --- a/include/asm-arm/arch-shark/system.h +++ b/arch/arm/mach-shark/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-shark/system.h + * arch/arm/mach-shark/include/mach/system.h * * by Alexander Schulz */ diff --git a/include/asm-arm/arch-shark/timex.h b/arch/arm/mach-shark/include/mach/timex.h index 0d02d255513b..bb6eeaebed86 100644 --- a/include/asm-arm/arch-shark/timex.h +++ b/arch/arm/mach-shark/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-shark/timex.h + * arch/arm/mach-shark/include/mach/timex.h * * by Alexander Schulz */ diff --git a/include/asm-arm/arch-shark/uncompress.h b/arch/arm/mach-shark/include/mach/uncompress.h index 7eca6534f1bb..3725e1633418 100644 --- a/include/asm-arm/arch-shark/uncompress.h +++ b/arch/arm/mach-shark/include/mach/uncompress.h @@ -1,9 +1,9 @@ /* - * linux/include/asm-arm/arch-shark/uncompress.h + * arch/arm/mach-shark/include/mach/uncompress.h * by Alexander Schulz * * derived from: - * linux/include/asm-arm/arch-ebsa285/uncompress.h + * arch/arm/mach-footbridge/include/mach/uncompress.h * Copyright (C) 1996,1997,1998 Russell King */ diff --git a/include/asm-arm/arch-shark/vmalloc.h b/arch/arm/mach-shark/include/mach/vmalloc.h index fac37c636b38..f6c6837c5451 100644 --- a/include/asm-arm/arch-shark/vmalloc.h +++ b/arch/arm/mach-shark/include/mach/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-shark/vmalloc.h + * arch/arm/mach-shark/include/mach/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x10000000) diff --git a/include/asm-arm/arch-versatile/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S index fe106d184e62..b4ac00eacf68 100644 --- a/include/asm-arm/arch-versatile/debug-macro.S +++ b/arch/arm/mach-versatile/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-versatile/debug-macro.S +/* arch/arm/mach-versatile/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-versatile/dma.h b/arch/arm/mach-versatile/include/mach/dma.h index 642577348623..0aabf12c8834 100644 --- a/include/asm-arm/arch-versatile/dma.h +++ b/arch/arm/mach-versatile/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/dma.h + * arch/arm/mach-versatile/include/mach/dma.h * * Copyright (C) 2003 ARM Limited. * Copyright (C) 1997,1998 Russell King diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S index cd114169c3e6..8c8020980585 100644 --- a/include/asm-arm/arch-versatile/entry-macro.S +++ b/arch/arm/mach-versatile/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-versatile/entry-macro.S + * arch/arm/mach-versatile/include/mach/entry-macro.S * * Low-level IRQ helper macros for Versatile 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/vic.h> .macro disable_fiq diff --git a/include/asm-arm/arch-versatile/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h index edc06598d187..7aa906c93154 100644 --- a/include/asm-arm/arch-versatile/hardware.h +++ b/arch/arm/mach-versatile/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/hardware.h + * arch/arm/mach-versatile/include/mach/hardware.h * * This file contains the hardware definitions of the Versatile boards. * @@ -23,7 +23,7 @@ #define __ASM_ARCH_HARDWARE_H #include <asm/sizes.h> -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * PCI space virtual addresses diff --git a/include/asm-arm/arch-versatile/io.h b/arch/arm/mach-versatile/include/mach/io.h index c4d01948e00b..c0b9dd1d0257 100644 --- a/include/asm-arm/arch-versatile/io.h +++ b/arch/arm/mach-versatile/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/io.h + * arch/arm/mach-versatile/include/mach/io.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h index f7263b99403b..216a1312e62e 100644 --- a/include/asm-arm/arch-versatile/irqs.h +++ b/arch/arm/mach-versatile/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/irqs.h + * arch/arm/mach-versatile/include/mach/irqs.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/arch/platform.h> +#include <mach/platform.h> /* * IRQ interrupts definitions are the same as the INT definitions diff --git a/include/asm-arm/arch-versatile/memory.h b/arch/arm/mach-versatile/include/mach/memory.h index a9370976cc5e..b6315c0602ac 100644 --- a/include/asm-arm/arch-versatile/memory.h +++ b/arch/arm/mach-versatile/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/memory.h + * arch/arm/mach-versatile/include/mach/memory.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/platform.h b/arch/arm/mach-versatile/include/mach/platform.h index 2af9d7c9c63c..27cbe6a3f220 100644 --- a/include/asm-arm/arch-versatile/platform.h +++ b/arch/arm/mach-versatile/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/platform.h + * arch/arm/mach-versatile/include/mach/platform.h * * Copyright (c) ARM Limited 2003. All rights reserved. * diff --git a/include/asm-arm/arch-versatile/system.h b/arch/arm/mach-versatile/include/mach/system.h index 3ea4e07b58c8..91fa559c7cca 100644 --- a/include/asm-arm/arch-versatile/system.h +++ b/arch/arm/mach-versatile/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/system.h + * arch/arm/mach-versatile/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-versatile/timex.h b/arch/arm/mach-versatile/include/mach/timex.h index 38fd04fc9141..426199b1add5 100644 --- a/include/asm-arm/arch-versatile/timex.h +++ b/arch/arm/mach-versatile/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/timex.h + * arch/arm/mach-versatile/include/mach/timex.h * * Versatile architecture timex specifications * diff --git a/include/asm-arm/arch-versatile/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h index 7215133d0514..3dd0048afb34 100644 --- a/include/asm-arm/arch-versatile/uncompress.h +++ b/arch/arm/mach-versatile/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/uncompress.h + * arch/arm/mach-versatile/include/mach/uncompress.h * * Copyright (C) 2003 ARM Limited * diff --git a/include/asm-arm/arch-versatile/vmalloc.h b/arch/arm/mach-versatile/include/mach/vmalloc.h index ac780df62156..427e3612db5d 100644 --- a/include/asm-arm/arch-versatile/vmalloc.h +++ b/arch/arm/mach-versatile/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-versatile/vmalloc.h + * arch/arm/mach-versatile/include/mach/vmalloc.h * * Copyright (C) 2003 ARM Limited * Copyright (C) 2000 Russell King. diff --git a/include/asm-arm/arch-mxc/board-mx27ads.h b/arch/arm/plat-mxc/include/mach/board-mx27ads.h index 61e66dac90ef..61e66dac90ef 100644 --- a/include/asm-arm/arch-mxc/board-mx27ads.h +++ b/arch/arm/plat-mxc/include/mach/board-mx27ads.h diff --git a/include/asm-arm/arch-mxc/board-mx31ads.h b/arch/arm/plat-mxc/include/mach/board-mx31ads.h index 1bc6fb0f9a83..1bc6fb0f9a83 100644 --- a/include/asm-arm/arch-mxc/board-mx31ads.h +++ b/arch/arm/plat-mxc/include/mach/board-mx31ads.h diff --git a/include/asm-arm/arch-mxc/board-mx31lite.h b/arch/arm/plat-mxc/include/mach/board-mx31lite.h index e4e5cf5ad7db..e4e5cf5ad7db 100644 --- a/include/asm-arm/arch-mxc/board-mx31lite.h +++ b/arch/arm/plat-mxc/include/mach/board-mx31lite.h diff --git a/include/asm-arm/arch-mxc/board-pcm037.h b/arch/arm/plat-mxc/include/mach/board-pcm037.h index 82232ba3c8fc..82232ba3c8fc 100644 --- a/include/asm-arm/arch-mxc/board-pcm037.h +++ b/arch/arm/plat-mxc/include/mach/board-pcm037.h diff --git a/include/asm-arm/arch-mxc/board-pcm038.h b/arch/arm/plat-mxc/include/mach/board-pcm038.h index 750c62afd90f..750c62afd90f 100644 --- a/include/asm-arm/arch-mxc/board-pcm038.h +++ b/arch/arm/plat-mxc/include/mach/board-pcm038.h diff --git a/include/asm-arm/arch-mxc/clock.h b/arch/arm/plat-mxc/include/mach/clock.h index 24caa2b7c91d..24caa2b7c91d 100644 --- a/include/asm-arm/arch-mxc/clock.h +++ b/arch/arm/plat-mxc/include/mach/clock.h diff --git a/include/asm-arm/arch-mxc/common.h b/arch/arm/plat-mxc/include/mach/common.h index a6d2e24aab15..a6d2e24aab15 100644 --- a/include/asm-arm/arch-mxc/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h diff --git a/include/asm-arm/arch-mxc/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 575087f8561a..b9907bebba3b 100644 --- a/include/asm-arm/arch-mxc/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-imx/debug-macro.S +/* arch/arm/mach-imx/include/mach/debug-macro.S * * Debugging macro include header * @@ -11,22 +11,22 @@ * */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #ifdef CONFIG_MACH_MX31ADS -#include <asm/arch/board-mx31ads.h> +#include <mach/board-mx31ads.h> #endif #ifdef CONFIG_MACH_PCM037 -#include <asm/arch/board-pcm037.h> +#include <mach/board-pcm037.h> #endif #ifdef CONFIG_MACH_MX31LITE -#include <asm/arch/board-mx31lite.h> +#include <mach/board-mx31lite.h> #endif #ifdef CONFIG_MACH_MX27ADS -#include <asm/arch/board-mx27ads.h> +#include <mach/board-mx27ads.h> #endif #ifdef CONFIG_MACH_PCM038 -#include <asm/arch/board-pcm038.h> +#include <mach/board-pcm038.h> #endif .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/include/asm-arm/arch-mxc/dma.h b/arch/arm/plat-mxc/include/mach/dma.h index c822d569a05e..c822d569a05e 100644 --- a/include/asm-arm/arch-mxc/dma.h +++ b/arch/arm/plat-mxc/include/mach/dma.h diff --git a/include/asm-arm/arch-mxc/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S index b542433afb1b..b542433afb1b 100644 --- a/include/asm-arm/arch-mxc/entry-macro.S +++ b/arch/arm/plat-mxc/include/mach/entry-macro.S diff --git a/include/asm-arm/arch-mxc/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 5f13a65e4044..65eedc0d196f 100644 --- a/include/asm-arm/arch-mxc/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@ -19,7 +19,7 @@ #ifndef __ASM_ARCH_MXC_GPIO_H__ #define __ASM_ARCH_MXC_GPIO_H__ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm-generic/gpio.h> /* use gpiolib dispatchers */ diff --git a/include/asm-arm/arch-mxc/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 37cddbaaade7..3caadeeda701 100644 --- a/include/asm-arm/arch-mxc/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h @@ -23,15 +23,15 @@ #include <asm/sizes.h> #ifdef CONFIG_ARCH_MX3 -# include <asm/arch/mx31.h> +# include <mach/mx31.h> #endif #ifdef CONFIG_ARCH_MX2 # ifdef CONFIG_MACH_MX27 -# include <asm/arch/mx27.h> +# include <mach/mx27.h> # endif #endif -#include <asm/arch/mxc.h> +#include <mach/mxc.h> #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ diff --git a/include/asm-arm/arch-mxc/iim.h b/arch/arm/plat-mxc/include/mach/iim.h index 315bffadafda..315bffadafda 100644 --- a/include/asm-arm/arch-mxc/iim.h +++ b/arch/arm/plat-mxc/include/mach/iim.h diff --git a/include/asm-arm/arch-mxc/imx-uart.h b/arch/arm/plat-mxc/include/mach/imx-uart.h index 83fb72c4048a..83fb72c4048a 100644 --- a/include/asm-arm/arch-mxc/imx-uart.h +++ b/arch/arm/plat-mxc/include/mach/imx-uart.h diff --git a/include/asm-arm/arch-mxc/io.h b/arch/arm/plat-mxc/include/mach/io.h index 65b6810124c1..65b6810124c1 100644 --- a/include/asm-arm/arch-mxc/io.h +++ b/arch/arm/plat-mxc/include/mach/io.h diff --git a/include/asm-arm/arch-mxc/iomux-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h index 076d37b38eb2..076d37b38eb2 100644 --- a/include/asm-arm/arch-mxc/iomux-mx1-mx2.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h diff --git a/include/asm-arm/arch-mxc/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h index 7509e7692f08..7509e7692f08 100644 --- a/include/asm-arm/arch-mxc/iomux-mx3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx3.h diff --git a/include/asm-arm/arch-mxc/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h index 21411efc10fb..228c4f68ccdf 100644 --- a/include/asm-arm/arch-mxc/irqs.h +++ b/arch/arm/plat-mxc/include/mach/irqs.h @@ -11,6 +11,6 @@ #ifndef __ASM_ARCH_MXC_IRQS_H__ #define __ASM_ARCH_MXC_IRQS_H__ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #endif /* __ASM_ARCH_MXC_IRQS_H__ */ diff --git a/include/asm-arm/arch-mxc/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 7e669ee0d634..d7a8d3ebed57 100644 --- a/include/asm-arm/arch-mxc/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_MXC_MEMORY_H__ #define __ASM_ARCH_MXC_MEMORY_H__ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * Virtual view <-> DMA view memory address translations diff --git a/include/asm-arm/arch-mxc/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h index 212ecc246626..212ecc246626 100644 --- a/include/asm-arm/arch-mxc/mx27.h +++ b/arch/arm/plat-mxc/include/mach/mx27.h diff --git a/include/asm-arm/arch-mxc/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index a7373e4a56cb..a7373e4a56cb 100644 --- a/include/asm-arm/arch-mxc/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h diff --git a/include/asm-arm/arch-mxc/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index 332eda4dbd3b..332eda4dbd3b 100644 --- a/include/asm-arm/arch-mxc/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h diff --git a/include/asm-arm/arch-mxc/mxc_timer.h b/arch/arm/plat-mxc/include/mach/mxc_timer.h index 5439fa6cf615..130aebfbe168 100644 --- a/include/asm-arm/arch-mxc/mxc_timer.h +++ b/arch/arm/plat-mxc/include/mach/mxc_timer.h @@ -24,7 +24,7 @@ #define __PLAT_MXC_TIMER_H #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #ifdef CONFIG_ARCH_IMX #define TIMER_BASE IO_ADDRESS(TIM1_BASE_ADDR) diff --git a/include/asm-arm/arch-mxc/system.h b/arch/arm/plat-mxc/include/mach/system.h index bbfc37465fc5..bbfc37465fc5 100644 --- a/include/asm-arm/arch-mxc/system.h +++ b/arch/arm/plat-mxc/include/mach/system.h diff --git a/include/asm-arm/arch-mxc/timex.h b/arch/arm/plat-mxc/include/mach/timex.h index 432e0c84c509..0b0af0253e91 100644 --- a/include/asm-arm/arch-mxc/timex.h +++ b/arch/arm/plat-mxc/include/mach/timex.h @@ -20,6 +20,6 @@ #ifndef __ASM_ARCH_MXC_TIMEX_H__ #define __ASM_ARCH_MXC_TIMEX_H__ -#include <asm/arch/hardware.h> /* for CLOCK_TICK_RATE */ +#include <mach/hardware.h> /* for CLOCK_TICK_RATE */ #endif /* __ASM_ARCH_MXC_TIMEX_H__ */ diff --git a/include/asm-arm/arch-mxc/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h index 18f33b0cdeb2..de6fe0365982 100644 --- a/include/asm-arm/arch-mxc/uncompress.h +++ b/arch/arm/plat-mxc/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-mxc/uncompress.h + * arch/arm/plat-mxc/include/mach/uncompress.h * * * @@ -25,7 +25,7 @@ #define __MXC_BOOT_UNCOMPRESS -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) diff --git a/include/asm-arm/arch-mxc/vmalloc.h b/arch/arm/plat-mxc/include/mach/vmalloc.h index 62d97623412f..62d97623412f 100644 --- a/include/asm-arm/arch-mxc/vmalloc.h +++ b/arch/arm/plat-mxc/include/mach/vmalloc.h 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/include/asm-arm/arch-ep93xx/dma.h b/include/asm-arm/arch-ep93xx/dma.h deleted file mode 100644 index 898b3ab7fd46..000000000000 --- a/include/asm-arm/arch-ep93xx/dma.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * linux/include/asm-arm/arch-ep93xx/dma.h - */ diff --git a/include/asm-arm/arch-ep93xx/gesbc9312.h b/include/asm-arm/arch-ep93xx/gesbc9312.h deleted file mode 100644 index 4d0b3023bff7..000000000000 --- a/include/asm-arm/arch-ep93xx/gesbc9312.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * linux/include/asm-arm/arch-ep93xx/gesbc9312.h - */ diff --git a/include/asm-arm/arch-ep93xx/timex.h b/include/asm-arm/arch-ep93xx/timex.h deleted file mode 100644 index 4140bddc97e2..000000000000 --- a/include/asm-arm/arch-ep93xx/timex.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * linux/include/asm-arm/arch-ep93xx/timex.h - */ - -#define CLOCK_TICK_RATE 983040 diff --git a/include/asm-arm/arch-ep93xx/vmalloc.h b/include/asm-arm/arch-ep93xx/vmalloc.h deleted file mode 100644 index 205ea6b1cf5e..000000000000 --- a/include/asm-arm/arch-ep93xx/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * linux/include/asm-arm/arch-ep93xx/vmalloc.h - */ - -#define VMALLOC_END 0xfe800000 diff --git a/include/asm-arm/arch-iop32x/vmalloc.h b/include/asm-arm/arch-iop32x/vmalloc.h deleted file mode 100644 index 0a70baa19517..000000000000 --- a/include/asm-arm/arch-iop32x/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-iop32x/vmalloc.h - */ - -#define VMALLOC_END 0xfe000000 diff --git a/include/asm-arm/arch-iop33x/vmalloc.h b/include/asm-arm/arch-iop33x/vmalloc.h deleted file mode 100644 index 66f545a7f4fc..000000000000 --- a/include/asm-arm/arch-iop33x/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-iop33x/vmalloc.h - */ - -#define VMALLOC_END 0xfe000000 diff --git a/include/asm-arm/arch-ixp23xx/dma.h b/include/asm-arm/arch-ixp23xx/dma.h deleted file mode 100644 index 2f4335e3b836..000000000000 --- a/include/asm-arm/arch-ixp23xx/dma.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * include/asm-arm/arch-ixp23xx/dma.h - */ diff --git a/include/asm-arm/arch-ixp23xx/time.h b/include/asm-arm/arch-ixp23xx/time.h deleted file mode 100644 index f6828fdd2883..000000000000 --- a/include/asm-arm/arch-ixp23xx/time.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * include/asm-arm/arch-ixp23xx/time.h - */ diff --git a/include/asm-arm/arch-kirkwood/vmalloc.h b/include/asm-arm/arch-kirkwood/vmalloc.h deleted file mode 100644 index 41852c6e77f3..000000000000 --- a/include/asm-arm/arch-kirkwood/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-kirkwood/vmalloc.h - */ - -#define VMALLOC_END 0xfe800000 diff --git a/include/asm-arm/arch-loki/vmalloc.h b/include/asm-arm/arch-loki/vmalloc.h deleted file mode 100644 index f5be06220491..000000000000 --- a/include/asm-arm/arch-loki/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-loki/vmalloc.h - */ - -#define VMALLOC_END 0xfe800000 diff --git a/include/asm-arm/arch-mv78xx0/vmalloc.h b/include/asm-arm/arch-mv78xx0/vmalloc.h deleted file mode 100644 index f2c512197579..000000000000 --- a/include/asm-arm/arch-mv78xx0/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-mv78xx0/vmalloc.h - */ - -#define VMALLOC_END 0xfe000000 diff --git a/include/asm-arm/arch-orion5x/vmalloc.h b/include/asm-arm/arch-orion5x/vmalloc.h deleted file mode 100644 index 2b3061e90dc1..000000000000 --- a/include/asm-arm/arch-orion5x/vmalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-arm/arch-orion5x/vmalloc.h - */ - -#define VMALLOC_END 0xfd800000 diff --git a/include/asm-arm/arch-sa1100/vmalloc.h b/include/asm-arm/arch-sa1100/vmalloc.h deleted file mode 100644 index 2fb1c6f3aa1b..000000000000 --- a/include/asm-arm/arch-sa1100/vmalloc.h +++ /dev/null @@ -1,4 +0,0 @@ -/* - * linux/include/asm-arm/arch-sa1100/vmalloc.h - */ -#define VMALLOC_END (0xe8000000) diff --git a/include/asm-arm/plat-s3c/iic.h b/include/asm-arm/plat-s3c/iic.h index d08a1f2863e4..5106acaa1d0e 100644 --- a/include/asm-arm/plat-s3c/iic.h +++ b/include/asm-arm/plat-s3c/iic.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/iic.h +/* arch/arm/mach-s3c2410/include/mach/iic.h * * Copyright (c) 2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h index ad6bbe90616e..f4dcd14af059 100644 --- a/include/asm-arm/plat-s3c/nand.h +++ b/include/asm-arm/plat-s3c/nand.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/nand.h +/* arch/arm/mach-s3c2410/include/mach/nand.h * * Copyright (c) 2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/plat-s3c/regs-ac97.h b/include/asm-arm/plat-s3c/regs-ac97.h index b004dee6bcaf..c3878f7acb83 100644 --- a/include/asm-arm/plat-s3c/regs-ac97.h +++ b/include/asm-arm/plat-s3c/regs-ac97.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-ac97.h +/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h * * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c/regs-adc.h b/include/asm-arm/plat-s3c/regs-adc.h index c7f231963e76..4323cccc86cd 100644 --- a/include/asm-arm/plat-s3c/regs-adc.h +++ b/include/asm-arm/plat-s3c/regs-adc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-adc.h +/* arch/arm/mach-s3c2410/include/mach/regs-adc.h * * Copyright (c) 2004 Shannon Holland <holland@loser.net> * diff --git a/include/asm-arm/plat-s3c/regs-iic.h b/include/asm-arm/plat-s3c/regs-iic.h index 2ae29522f253..2f7c17de8ac8 100644 --- a/include/asm-arm/plat-s3c/regs-iic.h +++ b/include/asm-arm/plat-s3c/regs-iic.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-iic.h +/* arch/arm/mach-s3c2410/include/mach/regs-iic.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/include/asm-arm/plat-s3c/regs-nand.h index d742205ac172..09f0b5503f5b 100644 --- a/include/asm-arm/plat-s3c/regs-nand.h +++ b/include/asm-arm/plat-s3c/regs-nand.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-nand.h +/* arch/arm/mach-s3c2410/include/mach/regs-nand.h * * Copyright (c) 2004,2005 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c/regs-rtc.h b/include/asm-arm/plat-s3c/regs-rtc.h index 93b03c49710a..d5837cf8e402 100644 --- a/include/asm-arm/plat-s3c/regs-rtc.h +++ b/include/asm-arm/plat-s3c/regs-rtc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-rtc.h +/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c/regs-serial.h b/include/asm-arm/plat-s3c/regs-serial.h index 923e114db663..a0daa647b92c 100644 --- a/include/asm-arm/plat-s3c/regs-serial.h +++ b/include/asm-arm/plat-s3c/regs-serial.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-serial.h +/* arch/arm/mach-s3c2410/include/mach/regs-serial.h * * From linux/include/asm-arm/hardware/serial_s3c2410.h * diff --git a/include/asm-arm/plat-s3c/regs-timer.h b/include/asm-arm/plat-s3c/regs-timer.h index b5bc692f3489..b4366ea39677 100644 --- a/include/asm-arm/plat-s3c/regs-timer.h +++ b/include/asm-arm/plat-s3c/regs-timer.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-timer.h +/* arch/arm/mach-s3c2410/include/mach/regs-timer.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c/regs-watchdog.h b/include/asm-arm/plat-s3c/regs-watchdog.h index 56c4193b7a46..1229f076c0a0 100644 --- a/include/asm-arm/plat-s3c/regs-watchdog.h +++ b/include/asm-arm/plat-s3c/regs-watchdog.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-watchdog.h +/* arch/arm/mach-s3c2410/include/mach/regs-watchdog.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c24xx/regs-iis.h b/include/asm-arm/plat-s3c24xx/regs-iis.h index eaf77916a602..a6f1d5df13b4 100644 --- a/include/asm-arm/plat-s3c24xx/regs-iis.h +++ b/include/asm-arm/plat-s3c24xx/regs-iis.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-iis.h +/* arch/arm/mach-s3c2410/include/mach/regs-iis.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/plat-s3c24xx/regs-spi.h b/include/asm-arm/plat-s3c24xx/regs-spi.h index ea565b007d04..2b35479ee35c 100644 --- a/include/asm-arm/plat-s3c24xx/regs-spi.h +++ b/include/asm-arm/plat-s3c24xx/regs-spi.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-spi.h +/* arch/arm/mach-s3c2410/include/mach/regs-spi.h * * Copyright (c) 2004 Fetron GmbH * diff --git a/include/asm-arm/plat-s3c24xx/regs-udc.h b/include/asm-arm/plat-s3c24xx/regs-udc.h index e1e9805d2d9a..f0dd4a41b37b 100644 --- a/include/asm-arm/plat-s3c24xx/regs-udc.h +++ b/include/asm-arm/plat-s3c24xx/regs-udc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/regs-udc.h +/* arch/arm/mach-s3c2410/include/mach/regs-udc.h * * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at> * diff --git a/include/asm-arm/plat-s3c24xx/udc.h b/include/asm-arm/plat-s3c24xx/udc.h index b8aa6cb69b58..546bb4008f49 100644 --- a/include/asm-arm/plat-s3c24xx/udc.h +++ b/include/asm-arm/plat-s3c24xx/udc.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/udc.h +/* arch/arm/mach-s3c2410/include/mach/udc.h * * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org> * |