]> err.no Git - linux-2.6/commitdiff
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 5 Aug 2008 15:14:15 +0000 (16:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 7 Aug 2008 08:55:48 +0000 (09:55 +0100)
This just leaves include/asm-arm/plat-* to deal with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
1582 files changed:
Documentation/arm/IXP4xx
Documentation/arm/Interrupts
Documentation/arm/README
Documentation/arm/Samsung-S3C24XX/GPIO.txt
Documentation/arm/Samsung-S3C24XX/Overview.txt
Documentation/arm/Samsung-S3C24XX/USB-Host.txt
Documentation/spi/pxa2xx
Documentation/spi/spi-summary
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/boot/compressed/misc.c
arch/arm/common/locomo.c
arch/arm/common/sa1111.c
arch/arm/common/sharpsl_pm.c
arch/arm/common/time-acorn.c
arch/arm/common/uengine.c
arch/arm/include/asm/dma.h
arch/arm/include/asm/floppy.h
arch/arm/include/asm/gpio.h
arch/arm/include/asm/hardware/dec21285.h
arch/arm/include/asm/hardware/iop3xx-adma.h
arch/arm/include/asm/hardware/iop3xx-gpio.h
arch/arm/include/asm/hardware/sa1111.h
arch/arm/include/asm/io.h
arch/arm/include/asm/irq.h
arch/arm/include/asm/mc146818rtc.h
arch/arm/include/asm/memory.h
arch/arm/include/asm/mmzone.h
arch/arm/include/asm/mtd-xip.h
arch/arm/include/asm/pci.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/smp.h
arch/arm/include/asm/timex.h
arch/arm/include/asm/vga.h
arch/arm/kernel/crunch-bits.S
arch/arm/kernel/crunch.c
arch/arm/kernel/debug.S
arch/arm/kernel/ecard.c
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/process.c
arch/arm/lib/ecard.S
arch/arm/lib/io-readsw-armv3.S
arch/arm/lib/io-writesw-armv3.S
arch/arm/mach-aaec2000/aaed2000.c
arch/arm/mach-aaec2000/core.c
arch/arm/mach-aaec2000/include/mach/aaec2000.h [moved from include/asm-arm/arch-aaec2000/aaec2000.h with 99% similarity]
arch/arm/mach-aaec2000/include/mach/aaed2000.h [moved from include/asm-arm/arch-aaec2000/aaed2000.h with 96% similarity]
arch/arm/mach-aaec2000/include/mach/debug-macro.S [moved from include/asm-arm/arch-aaec2000/debug-macro.S with 93% similarity]
arch/arm/mach-aaec2000/include/mach/dma.h [moved from include/asm-arm/arch-aaec2000/dma.h with 84% similarity]
arch/arm/mach-aaec2000/include/mach/entry-macro.S [moved from include/asm-arm/arch-aaec2000/entry-macro.S with 91% similarity]
arch/arm/mach-aaec2000/include/mach/hardware.h [moved from include/asm-arm/arch-aaec2000/hardware.h with 93% similarity]
arch/arm/mach-aaec2000/include/mach/io.h [moved from include/asm-arm/arch-aaec2000/io.h with 82% similarity]
arch/arm/mach-aaec2000/include/mach/irqs.h [moved from include/asm-arm/arch-aaec2000/irqs.h with 97% similarity]
arch/arm/mach-aaec2000/include/mach/memory.h [moved from include/asm-arm/arch-aaec2000/memory.h with 93% similarity]
arch/arm/mach-aaec2000/include/mach/system.h [moved from include/asm-arm/arch-aaec2000/system.h with 90% similarity]
arch/arm/mach-aaec2000/include/mach/timex.h [moved from include/asm-arm/arch-aaec2000/timex.h with 89% similarity]
arch/arm/mach-aaec2000/include/mach/uncompress.h [moved from include/asm-arm/arch-aaec2000/uncompress.h with 94% similarity]
arch/arm/mach-aaec2000/include/mach/vmalloc.h [moved from include/asm-arm/arch-aaec2000/vmalloc.h with 88% similarity]
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91rm9200_time.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam926x_time.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/at91sam9rl_devices.c
arch/arm/mach-at91/at91x40.c
arch/arm/mach-at91/at91x40_time.c
arch/arm/mach-at91/board-1arm.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-carmeva.c
arch/arm/mach-at91/board-csb337.c
arch/arm/mach-at91/board-csb637.c
arch/arm/mach-at91/board-dk.c
arch/arm/mach-at91/board-eb01.c
arch/arm/mach-at91/board-eb9200.c
arch/arm/mach-at91/board-ecbat91.c
arch/arm/mach-at91/board-ek.c
arch/arm/mach-at91/board-kafa.c
arch/arm/mach-at91/board-kb9202.c
arch/arm/mach-at91/board-picotux200.c
arch/arm/mach-at91/board-qil-a9260.c
arch/arm/mach-at91/board-sam9-l9260.c
arch/arm/mach-at91/board-sam9260ek.c
arch/arm/mach-at91/board-sam9261ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9rlek.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-at91/board-yl-9200.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/gpio.c
arch/arm/mach-at91/include/mach/at91_adc.h [moved from include/asm-arm/arch-at91/at91_adc.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_aic.h [moved from include/asm-arm/arch-at91/at91_aic.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_dbgu.h [moved from include/asm-arm/arch-at91/at91_dbgu.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_mci.h [moved from include/asm-arm/arch-at91/at91_mci.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91_pio.h [moved from include/asm-arm/arch-at91/at91_pio.h with 97% similarity]
arch/arm/mach-at91/include/mach/at91_pit.h [moved from include/asm-arm/arch-at91/at91_pit.h with 95% similarity]
arch/arm/mach-at91/include/mach/at91_pmc.h [moved from include/asm-arm/arch-at91/at91_pmc.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91_rstc.h [moved from include/asm-arm/arch-at91/at91_rstc.h with 97% similarity]
arch/arm/mach-at91/include/mach/at91_rtc.h [moved from include/asm-arm/arch-at91/at91_rtc.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_rtt.h [moved from include/asm-arm/arch-at91/at91_rtt.h with 96% similarity]
arch/arm/mach-at91/include/mach/at91_shdwc.h [moved from include/asm-arm/arch-at91/at91_shdwc.h with 96% similarity]
arch/arm/mach-at91/include/mach/at91_spi.h [moved from include/asm-arm/arch-at91/at91_spi.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_ssc.h [moved from include/asm-arm/arch-at91/at91_ssc.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91_st.h [moved from include/asm-arm/arch-at91/at91_st.h with 97% similarity]
arch/arm/mach-at91/include/mach/at91_tc.h [moved from include/asm-arm/arch-at91/at91_tc.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91_twi.h [moved from include/asm-arm/arch-at91/at91_twi.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91_wdt.h [moved from include/asm-arm/arch-at91/at91_wdt.h with 96% similarity]
arch/arm/mach-at91/include/mach/at91cap9.h [moved from include/asm-arm/arch-at91/at91cap9.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h [moved from include/asm-arm/arch-at91/at91cap9_ddrsdr.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91cap9_matrix.h [moved from include/asm-arm/arch-at91/at91cap9_matrix.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91rm9200.h [moved from include/asm-arm/arch-at91/at91rm9200.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91rm9200_emac.h [moved from include/asm-arm/arch-at91/at91rm9200_emac.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91rm9200_mc.h [moved from include/asm-arm/arch-at91/at91rm9200_mc.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91sam9260.h [moved from include/asm-arm/arch-at91/at91sam9260.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91sam9260_matrix.h [moved from include/asm-arm/arch-at91/at91sam9260_matrix.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9261.h [moved from include/asm-arm/arch-at91/at91sam9261.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9261_matrix.h [moved from include/asm-arm/arch-at91/at91sam9261_matrix.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9263.h [moved from include/asm-arm/arch-at91/at91sam9263.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91sam9263_matrix.h [moved from include/asm-arm/arch-at91/at91sam9263_matrix.h with 99% similarity]
arch/arm/mach-at91/include/mach/at91sam9_sdramc.h [moved from include/asm-arm/arch-at91/at91sam9_sdramc.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9_smc.h [moved from include/asm-arm/arch-at91/at91sam9_smc.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9rl.h [moved from include/asm-arm/arch-at91/at91sam9rl.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h [moved from include/asm-arm/arch-at91/at91sam9rl_matrix.h with 98% similarity]
arch/arm/mach-at91/include/mach/at91x40.h [moved from include/asm-arm/arch-at91/at91x40.h with 97% similarity]
arch/arm/mach-at91/include/mach/board.h [moved from include/asm-arm/arch-at91/board.h with 99% similarity]
arch/arm/mach-at91/include/mach/cpu.h [moved from include/asm-arm/arch-at91/cpu.h with 96% similarity]
arch/arm/mach-at91/include/mach/debug-macro.S [moved from include/asm-arm/arch-at91/debug-macro.S with 90% similarity]
arch/arm/mach-at91/include/mach/dma.h [moved from include/asm-arm/arch-at91/dma.h with 94% similarity]
arch/arm/mach-at91/include/mach/entry-macro.S [moved from include/asm-arm/arch-at91/entry-macro.S with 90% similarity]
arch/arm/mach-at91/include/mach/gpio.h [moved from include/asm-arm/arch-at91/gpio.h with 99% similarity]
arch/arm/mach-at91/include/mach/hardware.h [moved from include/asm-arm/arch-at91/hardware.h with 89% similarity]
arch/arm/mach-at91/include/mach/io.h [moved from include/asm-arm/arch-at91/io.h with 97% similarity]
arch/arm/mach-at91/include/mach/irqs.h [moved from include/asm-arm/arch-at91/irqs.h with 95% similarity]
arch/arm/mach-at91/include/mach/memory.h [moved from include/asm-arm/arch-at91/memory.h with 94% similarity]
arch/arm/mach-at91/include/mach/system.h [moved from include/asm-arm/arch-at91/system.h with 91% similarity]
arch/arm/mach-at91/include/mach/timex.h [moved from include/asm-arm/arch-at91/timex.h with 96% similarity]
arch/arm/mach-at91/include/mach/uncompress.h [moved from include/asm-arm/arch-at91/uncompress.h with 97% similarity]
arch/arm/mach-at91/include/mach/vmalloc.h [moved from include/asm-arm/arch-at91/vmalloc.h with 95% similarity]
arch/arm/mach-at91/irq.c
arch/arm/mach-at91/leds.c
arch/arm/mach-at91/pm.c
arch/arm/mach-clps711x/autcpu12.c
arch/arm/mach-clps711x/cdb89712.c
arch/arm/mach-clps711x/ceiva.c
arch/arm/mach-clps711x/edb7211-mm.c
arch/arm/mach-clps711x/fortunet.c
arch/arm/mach-clps711x/include/mach/autcpu12.h [moved from include/asm-arm/arch-clps711x/autcpu12.h with 100% similarity]
arch/arm/mach-clps711x/include/mach/debug-macro.S [moved from include/asm-arm/arch-clps711x/debug-macro.S with 94% similarity]
arch/arm/mach-clps711x/include/mach/dma.h [moved from include/asm-arm/arch-clps711x/dma.h with 94% similarity]
arch/arm/mach-clps711x/include/mach/entry-macro.S [moved from include/asm-arm/arch-clps711x/entry-macro.S with 94% similarity]
arch/arm/mach-clps711x/include/mach/hardware.h [moved from include/asm-arm/arch-clps711x/hardware.h with 99% similarity]
arch/arm/mach-clps711x/include/mach/io.h [moved from include/asm-arm/arch-clps711x/io.h with 94% similarity]
arch/arm/mach-clps711x/include/mach/irqs.h [moved from include/asm-arm/arch-clps711x/irqs.h with 96% similarity]
arch/arm/mach-clps711x/include/mach/memory.h [moved from include/asm-arm/arch-clps711x/memory.h with 98% similarity]
arch/arm/mach-clps711x/include/mach/syspld.h [moved from include/asm-arm/arch-clps711x/syspld.h with 98% similarity]
arch/arm/mach-clps711x/include/mach/system.h [moved from include/asm-arm/arch-clps711x/system.h with 93% similarity]
arch/arm/mach-clps711x/include/mach/time.h [moved from include/asm-arm/arch-clps711x/time.h with 96% similarity]
arch/arm/mach-clps711x/include/mach/timex.h [moved from include/asm-arm/arch-clps711x/timex.h with 94% similarity]
arch/arm/mach-clps711x/include/mach/uncompress.h [moved from include/asm-arm/arch-clps711x/uncompress.h with 93% similarity]
arch/arm/mach-clps711x/include/mach/vmalloc.h [moved from include/asm-arm/arch-clps711x/vmalloc.h with 94% similarity]
arch/arm/mach-clps711x/irq.c
arch/arm/mach-clps711x/mm.c
arch/arm/mach-clps711x/p720t-leds.c
arch/arm/mach-clps711x/p720t.c
arch/arm/mach-clps711x/time.c
arch/arm/mach-clps7500/core.c
arch/arm/mach-clps7500/include/mach/acornfb.h [moved from include/asm-arm/arch-cl7500/acornfb.h with 100% similarity]
arch/arm/mach-clps7500/include/mach/debug-macro.S [moved from include/asm-arm/arch-cl7500/debug-macro.S with 90% similarity]
arch/arm/mach-clps7500/include/mach/dma.h [moved from include/asm-arm/arch-cl7500/dma.h with 90% similarity]
arch/arm/mach-clps7500/include/mach/entry-macro.S [moved from include/asm-arm/arch-rpc/entry-macro.S with 91% similarity]
arch/arm/mach-clps7500/include/mach/hardware.h [moved from include/asm-arm/arch-cl7500/hardware.h with 95% similarity]
arch/arm/mach-clps7500/include/mach/io.h [moved from include/asm-arm/arch-cl7500/io.h with 98% similarity]
arch/arm/mach-clps7500/include/mach/irq.h [moved from include/asm-arm/arch-cl7500/irq.h with 93% similarity]
arch/arm/mach-clps7500/include/mach/irqs.h [moved from include/asm-arm/arch-cl7500/irqs.h with 96% similarity]
arch/arm/mach-clps7500/include/mach/memory.h [moved from include/asm-arm/arch-cl7500/memory.h with 94% similarity]
arch/arm/mach-clps7500/include/mach/system.h [moved from include/asm-arm/arch-cl7500/system.h with 87% similarity]
arch/arm/mach-clps7500/include/mach/timex.h [moved from include/asm-arm/arch-cl7500/timex.h with 79% similarity]
arch/arm/mach-clps7500/include/mach/uncompress.h [moved from include/asm-arm/arch-cl7500/uncompress.h with 93% similarity]
arch/arm/mach-clps7500/include/mach/vmalloc.h [moved from include/asm-arm/arch-cl7500/vmalloc.h with 55% similarity]
arch/arm/mach-davinci/board-evm.c
arch/arm/mach-davinci/clock.c
arch/arm/mach-davinci/gpio.c
arch/arm/mach-davinci/include/mach/clock.h [moved from include/asm-arm/arch-davinci/clock.h with 92% similarity]
arch/arm/mach-davinci/include/mach/common.h [moved from include/asm-arm/arch-davinci/common.h with 100% similarity]
arch/arm/mach-davinci/include/mach/debug-macro.S [moved from include/asm-arm/arch-davinci/debug-macro.S with 100% similarity]
arch/arm/mach-davinci/include/mach/dma.h [moved from include/asm-arm/arch-davinci/dma.h with 100% similarity]
arch/arm/mach-davinci/include/mach/entry-macro.S [moved from include/asm-arm/arch-davinci/entry-macro.S with 93% similarity]
arch/arm/mach-davinci/include/mach/gpio.h [moved from include/asm-arm/arch-davinci/gpio.h with 99% similarity]
arch/arm/mach-davinci/include/mach/hardware.h [moved from include/asm-arm/arch-davinci/hardware.h with 100% similarity]
arch/arm/mach-davinci/include/mach/i2c.h [moved from include/asm-arm/arch-davinci/i2c.h with 100% similarity]
arch/arm/mach-davinci/include/mach/io.h [moved from include/asm-arm/arch-davinci/io.h with 100% similarity]
arch/arm/mach-davinci/include/mach/irqs.h [moved from include/asm-arm/arch-davinci/irqs.h with 100% similarity]
arch/arm/mach-davinci/include/mach/memory.h [moved from include/asm-arm/arch-davinci/memory.h with 100% similarity]
arch/arm/mach-davinci/include/mach/mux.h [moved from include/asm-arm/arch-davinci/mux.h with 100% similarity]
arch/arm/mach-davinci/include/mach/psc.h [moved from include/asm-arm/arch-davinci/psc.h with 100% similarity]
arch/arm/mach-davinci/include/mach/serial.h [moved from include/asm-arm/arch-davinci/serial.h with 95% similarity]
arch/arm/mach-davinci/include/mach/system.h [moved from include/asm-arm/arch-davinci/system.h with 95% similarity]
arch/arm/mach-davinci/include/mach/timex.h [moved from include/asm-arm/arch-davinci/timex.h with 100% similarity]
arch/arm/mach-davinci/include/mach/uncompress.h [moved from include/asm-arm/arch-davinci/uncompress.h with 96% similarity]
arch/arm/mach-davinci/include/mach/vmalloc.h [moved from include/asm-arm/arch-davinci/vmalloc.h with 95% similarity]
arch/arm/mach-davinci/io.c
arch/arm/mach-davinci/irq.c
arch/arm/mach-davinci/mux.c
arch/arm/mach-davinci/psc.c
arch/arm/mach-davinci/serial.c
arch/arm/mach-davinci/time.c
arch/arm/mach-ebsa110/core.c
arch/arm/mach-ebsa110/include/mach/debug-macro.S [moved from include/asm-arm/arch-ebsa110/debug-macro.S with 90% similarity]
arch/arm/mach-ebsa110/include/mach/dma.h [moved from include/asm-arm/arch-ebsa110/dma.h with 85% similarity]
arch/arm/mach-ebsa110/include/mach/entry-macro.S [moved from include/asm-arm/arch-ebsa110/entry-macro.S with 93% similarity]
arch/arm/mach-ebsa110/include/mach/hardware.h [moved from include/asm-arm/arch-ebsa110/hardware.h with 97% similarity]
arch/arm/mach-ebsa110/include/mach/io.h [moved from include/asm-arm/arch-ebsa110/io.h with 98% similarity]
arch/arm/mach-ebsa110/include/mach/irqs.h [moved from include/asm-arm/arch-ebsa110/irqs.h with 91% similarity]
arch/arm/mach-ebsa110/include/mach/memory.h [moved from include/asm-arm/arch-ebsa110/memory.h with 94% similarity]
arch/arm/mach-ebsa110/include/mach/system.h [moved from include/asm-arm/arch-ebsa110/system.h with 95% similarity]
arch/arm/mach-ebsa110/include/mach/timex.h [moved from include/asm-arm/arch-ebsa110/timex.h with 90% similarity]
arch/arm/mach-ebsa110/include/mach/uncompress.h [moved from include/asm-arm/arch-ebsa110/uncompress.h with 94% similarity]
arch/arm/mach-ebsa110/include/mach/vmalloc.h [moved from include/asm-arm/arch-ebsa110/vmalloc.h with 85% similarity]
arch/arm/mach-ebsa110/io.c
arch/arm/mach-ebsa110/leds.c
arch/arm/mach-ep93xx/adssphere.c
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-ep93xx/core.c
arch/arm/mach-ep93xx/edb9302.c
arch/arm/mach-ep93xx/edb9302a.c
arch/arm/mach-ep93xx/edb9307.c
arch/arm/mach-ep93xx/edb9312.c
arch/arm/mach-ep93xx/edb9315.c
arch/arm/mach-ep93xx/edb9315a.c
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/gpio.c
arch/arm/mach-ep93xx/include/mach/debug-macro.S [moved from include/asm-arm/arch-ep93xx/debug-macro.S with 87% similarity]
arch/arm/mach-ep93xx/include/mach/dma.h [new file with mode: 0644]
arch/arm/mach-ep93xx/include/mach/entry-macro.S [moved from include/asm-arm/arch-ep93xx/entry-macro.S with 93% similarity]
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h [moved from include/asm-arm/arch-ep93xx/ep93xx-regs.h with 98% similarity]
arch/arm/mach-ep93xx/include/mach/gesbc9312.h [new file with mode: 0644]
arch/arm/mach-ep93xx/include/mach/gpio.h [moved from include/asm-arm/arch-ep93xx/gpio.h with 99% similarity]
arch/arm/mach-ep93xx/include/mach/hardware.h [moved from include/asm-arm/arch-ep93xx/hardware.h with 81% similarity]
arch/arm/mach-ep93xx/include/mach/io.h [moved from include/asm-arm/arch-ep93xx/io.h with 72% similarity]
arch/arm/mach-ep93xx/include/mach/irqs.h [moved from include/asm-arm/arch-ep93xx/irqs.h with 97% similarity]
arch/arm/mach-ep93xx/include/mach/memory.h [moved from include/asm-arm/arch-ep93xx/memory.h with 81% similarity]
arch/arm/mach-ep93xx/include/mach/platform.h [moved from include/asm-arm/arch-ep93xx/platform.h with 85% similarity]
arch/arm/mach-ep93xx/include/mach/system.h [moved from include/asm-arm/arch-ep93xx/system.h with 85% similarity]
arch/arm/mach-ep93xx/include/mach/timex.h [new file with mode: 0644]
arch/arm/mach-ep93xx/include/mach/ts72xx.h [moved from include/asm-arm/arch-ep93xx/ts72xx.h with 98% similarity]
arch/arm/mach-ep93xx/include/mach/uncompress.h [moved from include/asm-arm/arch-ep93xx/uncompress.h with 95% similarity]
arch/arm/mach-ep93xx/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-ep93xx/micro9.c
arch/arm/mach-ep93xx/ts72xx.c
arch/arm/mach-footbridge/ebsa285-leds.c
arch/arm/mach-footbridge/include/mach/debug-macro.S [moved from include/asm-arm/arch-ebsa285/debug-macro.S with 95% similarity]
arch/arm/mach-footbridge/include/mach/dma.h [moved from include/asm-arm/arch-ebsa285/dma.h with 91% similarity]
arch/arm/mach-footbridge/include/mach/entry-macro.S [moved from include/asm-arm/arch-ebsa285/entry-macro.S with 95% similarity]
arch/arm/mach-footbridge/include/mach/hardware.h [moved from include/asm-arm/arch-ebsa285/hardware.h with 97% similarity]
arch/arm/mach-footbridge/include/mach/io.h [moved from include/asm-arm/arch-ebsa285/io.h with 91% similarity]
arch/arm/mach-footbridge/include/mach/irqs.h [moved from include/asm-arm/arch-ebsa285/irqs.h with 98% similarity]
arch/arm/mach-footbridge/include/mach/memory.h [moved from include/asm-arm/arch-ebsa285/memory.h with 96% similarity]
arch/arm/mach-footbridge/include/mach/system.h [moved from include/asm-arm/arch-ebsa285/system.h with 95% similarity]
arch/arm/mach-footbridge/include/mach/timex.h [moved from include/asm-arm/arch-ebsa285/timex.h with 90% similarity]
arch/arm/mach-footbridge/include/mach/uncompress.h [moved from include/asm-arm/arch-ebsa285/uncompress.h with 93% similarity]
arch/arm/mach-footbridge/include/mach/vmalloc.h [moved from include/asm-arm/arch-ebsa285/vmalloc.h with 82% similarity]
arch/arm/mach-footbridge/isa-irq.c
arch/arm/mach-footbridge/netwinder-leds.c
arch/arm/mach-footbridge/time.c
arch/arm/mach-h720x/common.c
arch/arm/mach-h720x/cpu-h7201.c
arch/arm/mach-h720x/cpu-h7202.c
arch/arm/mach-h720x/h7201-eval.c
arch/arm/mach-h720x/h7202-eval.c
arch/arm/mach-h720x/include/mach/boards.h [moved from include/asm-arm/arch-h720x/boards.h with 96% similarity]
arch/arm/mach-h720x/include/mach/debug-macro.S [moved from include/asm-arm/arch-h720x/debug-macro.S with 95% similarity]
arch/arm/mach-h720x/include/mach/dma.h [moved from include/asm-arm/arch-h720x/dma.h with 92% similarity]
arch/arm/mach-h720x/include/mach/entry-macro.S [moved from include/asm-arm/arch-h720x/entry-macro.S with 97% similarity]
arch/arm/mach-h720x/include/mach/h7201-regs.h [moved from include/asm-arm/arch-h720x/h7201-regs.h with 97% similarity]
arch/arm/mach-h720x/include/mach/h7202-regs.h [moved from include/asm-arm/arch-h720x/h7202-regs.h with 98% similarity]
arch/arm/mach-h720x/include/mach/hardware.h [moved from include/asm-arm/arch-h720x/hardware.h with 99% similarity]
arch/arm/mach-h720x/include/mach/io.h [moved from include/asm-arm/arch-h720x/io.h with 74% similarity]
arch/arm/mach-h720x/include/mach/irqs.h [moved from include/asm-arm/arch-h720x/irqs.h with 98% similarity]
arch/arm/mach-h720x/include/mach/memory.h [moved from include/asm-arm/arch-h720x/memory.h with 93% similarity]
arch/arm/mach-h720x/include/mach/system.h [moved from include/asm-arm/arch-h720x/system.h with 82% similarity]
arch/arm/mach-h720x/include/mach/timex.h [moved from include/asm-arm/arch-h720x/timex.h with 88% similarity]
arch/arm/mach-h720x/include/mach/uncompress.h [moved from include/asm-arm/arch-h720x/uncompress.h with 86% similarity]
arch/arm/mach-h720x/include/mach/vmalloc.h [moved from include/asm-arm/arch-h720x/vmalloc.h with 73% similarity]
arch/arm/mach-imx/clock.c
arch/arm/mach-imx/cpufreq.c
arch/arm/mach-imx/dma.c
arch/arm/mach-imx/generic.c
arch/arm/mach-imx/include/mach/debug-macro.S [moved from include/asm-arm/arch-imx/debug-macro.S with 94% similarity]
arch/arm/mach-imx/include/mach/dma.h [moved from include/asm-arm/arch-imx/dma.h with 100% similarity]
arch/arm/mach-imx/include/mach/entry-macro.S [moved from include/asm-arm/arch-imx/entry-macro.S with 91% similarity]
arch/arm/mach-imx/include/mach/gpio.h [moved from include/asm-arm/arch-imx/gpio.h with 98% similarity]
arch/arm/mach-imx/include/mach/hardware.h [moved from include/asm-arm/arch-imx/hardware.h with 98% similarity]
arch/arm/mach-imx/include/mach/imx-dma.h [moved from include/asm-arm/arch-imx/imx-dma.h with 100% similarity]
arch/arm/mach-imx/include/mach/imx-regs.h [moved from include/asm-arm/arch-imx/imx-regs.h with 100% similarity]
arch/arm/mach-imx/include/mach/imx-uart.h [moved from include/asm-arm/arch-imx/imx-uart.h with 100% similarity]
arch/arm/mach-imx/include/mach/imxfb.h [moved from include/asm-arm/arch-imx/imxfb.h with 100% similarity]
arch/arm/mach-imx/include/mach/io.h [moved from include/asm-arm/arch-imx/io.h with 92% similarity]
arch/arm/mach-imx/include/mach/irqs.h [moved from include/asm-arm/arch-imx/irqs.h with 98% similarity]
arch/arm/mach-imx/include/mach/memory.h [moved from include/asm-arm/arch-imx/memory.h with 96% similarity]
arch/arm/mach-imx/include/mach/mmc.h [moved from include/asm-arm/arch-imx/mmc.h with 100% similarity]
arch/arm/mach-imx/include/mach/mx1ads.h [moved from include/asm-arm/arch-imx/mx1ads.h with 96% similarity]
arch/arm/mach-imx/include/mach/spi_imx.h [moved from include/asm-arm/arch-imx/spi_imx.h with 95% similarity]
arch/arm/mach-imx/include/mach/system.h [moved from include/asm-arm/arch-imx/system.h with 95% similarity]
arch/arm/mach-imx/include/mach/timex.h [moved from include/asm-arm/arch-imx/timex.h with 100% similarity]
arch/arm/mach-imx/include/mach/uncompress.h [moved from include/asm-arm/arch-imx/uncompress.h with 97% similarity]
arch/arm/mach-imx/include/mach/vmalloc.h [moved from include/asm-arm/arch-imx/vmalloc.h with 94% similarity]
arch/arm/mach-imx/irq.c
arch/arm/mach-imx/leds-mx1ads.c
arch/arm/mach-imx/mx1ads.c
arch/arm/mach-imx/time.c
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/cpu.c
arch/arm/mach-integrator/impd1.c
arch/arm/mach-integrator/include/mach/bits.h [moved from include/asm-arm/arch-integrator/bits.h with 100% similarity]
arch/arm/mach-integrator/include/mach/cm.h [moved from include/asm-arm/arch-integrator/cm.h with 100% similarity]
arch/arm/mach-integrator/include/mach/debug-macro.S [moved from include/asm-arm/arch-integrator/debug-macro.S with 91% similarity]
arch/arm/mach-integrator/include/mach/dma.h [moved from include/asm-arm/arch-integrator/dma.h with 94% similarity]
arch/arm/mach-integrator/include/mach/entry-macro.S [moved from include/asm-arm/arch-integrator/entry-macro.S with 90% similarity]
arch/arm/mach-integrator/include/mach/hardware.h [moved from include/asm-arm/arch-integrator/hardware.h with 94% similarity]
arch/arm/mach-integrator/include/mach/impd1.h [moved from include/asm-arm/arch-integrator/impd1.h with 100% similarity]
arch/arm/mach-integrator/include/mach/io.h [moved from include/asm-arm/arch-integrator/io.h with 96% similarity]
arch/arm/mach-integrator/include/mach/irqs.h [moved from include/asm-arm/arch-integrator/irqs.h with 97% similarity]
arch/arm/mach-integrator/include/mach/lm.h [moved from include/asm-arm/arch-integrator/lm.h with 100% similarity]
arch/arm/mach-integrator/include/mach/memory.h [moved from include/asm-arm/arch-integrator/memory.h with 96% similarity]
arch/arm/mach-integrator/include/mach/platform.h [moved from include/asm-arm/arch-integrator/platform.h with 100% similarity]
arch/arm/mach-integrator/include/mach/system.h [moved from include/asm-arm/arch-integrator/system.h with 93% similarity]
arch/arm/mach-integrator/include/mach/timex.h [moved from include/asm-arm/arch-integrator/timex.h with 94% similarity]
arch/arm/mach-integrator/include/mach/uncompress.h [moved from include/asm-arm/arch-integrator/uncompress.h with 96% similarity]
arch/arm/mach-integrator/include/mach/vmalloc.h [moved from include/asm-arm/arch-integrator/vmalloc.h with 94% similarity]
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/leds.c
arch/arm/mach-integrator/lm.c
arch/arm/mach-integrator/pci_v3.c
arch/arm/mach-iop13xx/include/mach/adma.h [moved from include/asm-arm/arch-iop13xx/adma.h with 99% similarity]
arch/arm/mach-iop13xx/include/mach/debug-macro.S [moved from include/asm-arm/arch-iop13xx/debug-macro.S with 92% similarity]
arch/arm/mach-iop13xx/include/mach/dma.h [moved from include/asm-arm/arch-iop13xx/dma.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/entry-macro.S [moved from include/asm-arm/arch-iop13xx/entry-macro.S with 100% similarity]
arch/arm/mach-iop13xx/include/mach/hardware.h [moved from include/asm-arm/arch-iop13xx/hardware.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/io.h [moved from include/asm-arm/arch-iop13xx/io.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/iop13xx.h [moved from include/asm-arm/arch-iop13xx/iop13xx.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/iq81340.h [moved from include/asm-arm/arch-iop13xx/iq81340.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/irqs.h [moved from include/asm-arm/arch-iop13xx/irqs.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/memory.h [moved from include/asm-arm/arch-iop13xx/memory.h with 98% similarity]
arch/arm/mach-iop13xx/include/mach/msi.h [moved from include/asm-arm/arch-iop13xx/msi.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/pci.h [moved from include/asm-arm/arch-iop13xx/pci.h with 98% similarity]
arch/arm/mach-iop13xx/include/mach/system.h [moved from include/asm-arm/arch-iop13xx/system.h with 87% similarity]
arch/arm/mach-iop13xx/include/mach/time.h [moved from include/asm-arm/arch-iop13xx/time.h with 100% similarity]
arch/arm/mach-iop13xx/include/mach/timex.h [moved from include/asm-arm/arch-iop13xx/timex.h with 53% similarity]
arch/arm/mach-iop13xx/include/mach/uncompress.h [moved from include/asm-arm/arch-iop13xx/uncompress.h with 92% similarity]
arch/arm/mach-iop13xx/include/mach/vmalloc.h [moved from include/asm-arm/arch-iop13xx/vmalloc.h with 100% similarity]
arch/arm/mach-iop13xx/io.c
arch/arm/mach-iop13xx/iq81340mc.c
arch/arm/mach-iop13xx/iq81340sc.c
arch/arm/mach-iop13xx/irq.c
arch/arm/mach-iop13xx/pci.c
arch/arm/mach-iop13xx/setup.c
arch/arm/mach-iop32x/em7210.c
arch/arm/mach-iop32x/glantank.c
arch/arm/mach-iop32x/include/mach/adma.h [moved from include/asm-arm/arch-iop32x/adma.h with 100% similarity]
arch/arm/mach-iop32x/include/mach/debug-macro.S [moved from include/asm-arm/arch-iop32x/debug-macro.S with 91% similarity]
arch/arm/mach-iop32x/include/mach/dma.h [moved from include/asm-arm/arch-iop33x/dma.h with 84% similarity]
arch/arm/mach-iop32x/include/mach/entry-macro.S [moved from include/asm-arm/arch-iop32x/entry-macro.S with 92% similarity]
arch/arm/mach-iop32x/include/mach/glantank.h [moved from include/asm-arm/arch-iop32x/glantank.h with 75% similarity]
arch/arm/mach-iop32x/include/mach/gpio.h [moved from include/asm-arm/arch-iop32x/gpio.h with 100% similarity]
arch/arm/mach-iop32x/include/mach/hardware.h [moved from include/asm-arm/arch-iop32x/hardware.h with 94% similarity]
arch/arm/mach-iop32x/include/mach/io.h [moved from include/asm-arm/arch-iop32x/io.h with 90% similarity]
arch/arm/mach-iop32x/include/mach/iop32x.h [moved from include/asm-arm/arch-iop32x/iop32x.h with 95% similarity]
arch/arm/mach-iop32x/include/mach/iq31244.h [moved from include/asm-arm/arch-iop32x/iq31244.h with 89% similarity]
arch/arm/mach-iop32x/include/mach/iq80321.h [moved from include/asm-arm/arch-iop32x/iq80321.h with 89% similarity]
arch/arm/mach-iop32x/include/mach/irqs.h [moved from include/asm-arm/arch-iop32x/irqs.h with 96% similarity]
arch/arm/mach-iop32x/include/mach/memory.h [moved from include/asm-arm/arch-iop32x/memory.h with 87% similarity]
arch/arm/mach-iop32x/include/mach/n2100.h [moved from include/asm-arm/arch-iop32x/n2100.h with 89% similarity]
arch/arm/mach-iop32x/include/mach/system.h [moved from include/asm-arm/arch-iop32x/system.h with 93% similarity]
arch/arm/mach-iop32x/include/mach/time.h [moved from include/asm-arm/arch-iop32x/time.h with 100% similarity]
arch/arm/mach-iop32x/include/mach/timex.h [moved from include/asm-arm/arch-iop32x/timex.h with 56% similarity]
arch/arm/mach-iop32x/include/mach/uncompress.h [moved from include/asm-arm/arch-iop32x/uncompress.h with 90% similarity]
arch/arm/mach-iop32x/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-iop32x/iq31244.c
arch/arm/mach-iop32x/iq80321.c
arch/arm/mach-iop32x/irq.c
arch/arm/mach-iop32x/n2100.c
arch/arm/mach-iop33x/include/mach/adma.h [moved from include/asm-arm/arch-iop33x/adma.h with 100% similarity]
arch/arm/mach-iop33x/include/mach/debug-macro.S [moved from include/asm-arm/arch-iop33x/debug-macro.S with 92% similarity]
arch/arm/mach-iop33x/include/mach/dma.h [moved from include/asm-arm/arch-iop32x/dma.h with 84% similarity]
arch/arm/mach-iop33x/include/mach/entry-macro.S [moved from include/asm-arm/arch-iop33x/entry-macro.S with 92% similarity]
arch/arm/mach-iop33x/include/mach/gpio.h [moved from include/asm-arm/arch-iop33x/gpio.h with 100% similarity]
arch/arm/mach-iop33x/include/mach/hardware.h [moved from include/asm-arm/arch-iop33x/hardware.h with 94% similarity]
arch/arm/mach-iop33x/include/mach/io.h [moved from include/asm-arm/arch-iop33x/io.h with 90% similarity]
arch/arm/mach-iop33x/include/mach/iop33x.h [moved from include/asm-arm/arch-iop33x/iop33x.h with 96% similarity]
arch/arm/mach-iop33x/include/mach/iq80331.h [moved from include/asm-arm/arch-iop33x/iq80331.h with 87% similarity]
arch/arm/mach-iop33x/include/mach/iq80332.h [moved from include/asm-arm/arch-iop33x/iq80332.h with 87% similarity]
arch/arm/mach-iop33x/include/mach/irqs.h [moved from include/asm-arm/arch-iop33x/irqs.h with 97% similarity]
arch/arm/mach-iop33x/include/mach/memory.h [moved from include/asm-arm/arch-iop33x/memory.h with 87% similarity]
arch/arm/mach-iop33x/include/mach/system.h [moved from include/asm-arm/arch-iop33x/system.h with 90% similarity]
arch/arm/mach-iop33x/include/mach/time.h [moved from include/asm-arm/arch-iop33x/time.h with 100% similarity]
arch/arm/mach-iop33x/include/mach/timex.h [moved from include/asm-arm/arch-iop33x/timex.h with 56% similarity]
arch/arm/mach-iop33x/include/mach/uncompress.h [moved from include/asm-arm/arch-iop33x/uncompress.h with 89% similarity]
arch/arm/mach-iop33x/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-iop33x/iq80331.c
arch/arm/mach-iop33x/iq80332.c
arch/arm/mach-iop33x/irq.c
arch/arm/mach-iop33x/uart.c
arch/arm/mach-ixp2000/core.c
arch/arm/mach-ixp2000/enp2611.c
arch/arm/mach-ixp2000/include/mach/debug-macro.S [moved from include/asm-arm/arch-ixp2000/debug-macro.S with 92% similarity]
arch/arm/mach-ixp2000/include/mach/dma.h [moved from include/asm-arm/arch-ixp2000/dma.h with 84% similarity]
arch/arm/mach-ixp2000/include/mach/enp2611.h [moved from include/asm-arm/arch-ixp2000/enp2611.h with 96% similarity]
arch/arm/mach-ixp2000/include/mach/entry-macro.S [moved from include/asm-arm/arch-ixp2000/entry-macro.S with 94% similarity]
arch/arm/mach-ixp2000/include/mach/gpio.h [moved from include/asm-arm/arch-ixp2000/gpio.h with 96% similarity]
arch/arm/mach-ixp2000/include/mach/hardware.h [moved from include/asm-arm/arch-ixp2000/hardware.h with 95% similarity]
arch/arm/mach-ixp2000/include/mach/io.h [moved from include/asm-arm/arch-ixp2000/io.h with 97% similarity]
arch/arm/mach-ixp2000/include/mach/irqs.h [moved from include/asm-arm/arch-ixp2000/irqs.h with 99% similarity]
arch/arm/mach-ixp2000/include/mach/ixdp2x00.h [moved from include/asm-arm/arch-ixp2000/ixdp2x00.h with 98% similarity]
arch/arm/mach-ixp2000/include/mach/ixdp2x01.h [moved from include/asm-arm/arch-ixp2000/ixdp2x01.h with 97% similarity]
arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h [moved from include/asm-arm/arch-ixp2000/ixp2000-regs.h with 99% similarity]
arch/arm/mach-ixp2000/include/mach/memory.h [moved from include/asm-arm/arch-ixp2000/memory.h with 91% similarity]
arch/arm/mach-ixp2000/include/mach/platform.h [moved from include/asm-arm/arch-ixp2000/platform.h with 98% similarity]
arch/arm/mach-ixp2000/include/mach/system.h [moved from include/asm-arm/arch-ixp2000/system.h with 94% similarity]
arch/arm/mach-ixp2000/include/mach/timex.h [moved from include/asm-arm/arch-ixp2000/timex.h with 78% similarity]
arch/arm/mach-ixp2000/include/mach/uncompress.h [moved from include/asm-arm/arch-ixp2000/uncompress.h with 96% similarity]
arch/arm/mach-ixp2000/include/mach/vmalloc.h [moved from include/asm-arm/arch-ixp2000/vmalloc.h with 94% similarity]
arch/arm/mach-ixp2000/ixdp2400.c
arch/arm/mach-ixp2000/ixdp2800.c
arch/arm/mach-ixp2000/ixdp2x00.c
arch/arm/mach-ixp2000/ixdp2x01.c
arch/arm/mach-ixp2000/pci.c
arch/arm/mach-ixp23xx/core.c
arch/arm/mach-ixp23xx/espresso.c
arch/arm/mach-ixp23xx/include/mach/debug-macro.S [moved from include/asm-arm/arch-ixp23xx/debug-macro.S with 88% similarity]
arch/arm/mach-ixp23xx/include/mach/dma.h [new file with mode: 0644]
arch/arm/mach-ixp23xx/include/mach/entry-macro.S [moved from include/asm-arm/arch-ixp23xx/entry-macro.S with 93% similarity]
arch/arm/mach-ixp23xx/include/mach/hardware.h [moved from include/asm-arm/arch-ixp23xx/hardware.h with 93% similarity]
arch/arm/mach-ixp23xx/include/mach/io.h [moved from include/asm-arm/arch-ixp23xx/io.h with 96% similarity]
arch/arm/mach-ixp23xx/include/mach/irqs.h [moved from include/asm-arm/arch-ixp23xx/irqs.h with 99% similarity]
arch/arm/mach-ixp23xx/include/mach/ixdp2351.h [moved from include/asm-arm/arch-ixp23xx/ixdp2351.h with 98% similarity]
arch/arm/mach-ixp23xx/include/mach/ixp23xx.h [moved from include/asm-arm/arch-ixp23xx/ixp23xx.h with 99% similarity]
arch/arm/mach-ixp23xx/include/mach/memory.h [moved from include/asm-arm/arch-ixp23xx/memory.h with 93% similarity]
arch/arm/mach-ixp23xx/include/mach/platform.h [moved from include/asm-arm/arch-ixp23xx/platform.h with 96% similarity]
arch/arm/mach-ixp23xx/include/mach/system.h [moved from include/asm-arm/arch-ixp23xx/system.h with 90% similarity]
arch/arm/mach-ixp23xx/include/mach/time.h [new file with mode: 0644]
arch/arm/mach-ixp23xx/include/mach/timex.h [moved from include/asm-arm/arch-ixp23xx/timex.h with 65% similarity]
arch/arm/mach-ixp23xx/include/mach/uncompress.h [moved from include/asm-arm/arch-ixp23xx/uncompress.h with 89% similarity]
arch/arm/mach-ixp23xx/include/mach/vmalloc.h [moved from include/asm-arm/arch-ixp23xx/vmalloc.h with 79% similarity]
arch/arm/mach-ixp23xx/ixdp2351.c
arch/arm/mach-ixp23xx/pci.c
arch/arm/mach-ixp23xx/roadrunner.c
arch/arm/mach-ixp4xx/avila-pci.c
arch/arm/mach-ixp4xx/avila-setup.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/coyote-pci.c
arch/arm/mach-ixp4xx/coyote-setup.c
arch/arm/mach-ixp4xx/gateway7001-pci.c
arch/arm/mach-ixp4xx/gateway7001-setup.c
arch/arm/mach-ixp4xx/gtwx5715-pci.c
arch/arm/mach-ixp4xx/gtwx5715-setup.c
arch/arm/mach-ixp4xx/include/mach/avila.h [moved from include/asm-arm/arch-ixp4xx/avila.h with 87% similarity]
arch/arm/mach-ixp4xx/include/mach/coyote.h [moved from include/asm-arm/arch-ixp4xx/coyote.h with 87% similarity]
arch/arm/mach-ixp4xx/include/mach/cpu.h [moved from include/asm-arm/arch-ixp4xx/cpu.h with 96% similarity]
arch/arm/mach-ixp4xx/include/mach/debug-macro.S [moved from include/asm-arm/arch-ixp4xx/debug-macro.S with 93% similarity]
arch/arm/mach-ixp4xx/include/mach/dma.h [moved from include/asm-arm/arch-ixp4xx/dma.h with 86% similarity]
arch/arm/mach-ixp4xx/include/mach/dsmg600.h [moved from include/asm-arm/arch-ixp4xx/dsmg600.h with 93% similarity]
arch/arm/mach-ixp4xx/include/mach/entry-macro.S [moved from include/asm-arm/arch-ixp4xx/entry-macro.S with 93% similarity]
arch/arm/mach-ixp4xx/include/mach/fsg.h [moved from include/asm-arm/arch-ixp4xx/fsg.h with 90% similarity]
arch/arm/mach-ixp4xx/include/mach/gpio.h [moved from include/asm-arm/arch-ixp4xx/gpio.h with 95% similarity]
arch/arm/mach-ixp4xx/include/mach/gtwx5715.h [moved from include/asm-arm/arch-ixp4xx/gtwx5715.h with 96% similarity]
arch/arm/mach-ixp4xx/include/mach/hardware.h [moved from include/asm-arm/arch-ixp4xx/hardware.h with 93% similarity]
arch/arm/mach-ixp4xx/include/mach/io.h [moved from include/asm-arm/arch-ixp4xx/io.h with 99% similarity]
arch/arm/mach-ixp4xx/include/mach/irqs.h [moved from include/asm-arm/arch-ixp4xx/irqs.h with 98% similarity]
arch/arm/mach-ixp4xx/include/mach/ixdp425.h [moved from include/asm-arm/arch-ixp4xx/ixdp425.h with 87% similarity]
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h [moved from include/asm-arm/arch-ixp4xx/ixp4xx-regs.h with 99% similarity]
arch/arm/mach-ixp4xx/include/mach/memory.h [moved from include/asm-arm/arch-ixp4xx/memory.h with 95% similarity]
arch/arm/mach-ixp4xx/include/mach/nas100d.h [moved from include/asm-arm/arch-ixp4xx/nas100d.h with 90% similarity]
arch/arm/mach-ixp4xx/include/mach/npe.h [moved from include/asm-arm/arch-ixp4xx/npe.h with 100% similarity]
arch/arm/mach-ixp4xx/include/mach/nslu2.h [moved from include/asm-arm/arch-ixp4xx/nslu2.h with 90% similarity]
arch/arm/mach-ixp4xx/include/mach/platform.h [moved from include/asm-arm/arch-ixp4xx/platform.h with 97% similarity]
arch/arm/mach-ixp4xx/include/mach/prpmc1100.h [moved from include/asm-arm/arch-ixp4xx/prpmc1100.h with 86% similarity]
arch/arm/mach-ixp4xx/include/mach/qmgr.h [moved from include/asm-arm/arch-ixp4xx/qmgr.h with 100% similarity]
arch/arm/mach-ixp4xx/include/mach/system.h [moved from include/asm-arm/arch-ixp4xx/system.h with 91% similarity]
arch/arm/mach-ixp4xx/include/mach/timex.h [moved from include/asm-arm/arch-ixp4xx/timex.h with 81% similarity]
arch/arm/mach-ixp4xx/include/mach/udc.h [moved from include/asm-arm/arch-ixp4xx/udc.h with 72% similarity]
arch/arm/mach-ixp4xx/include/mach/uncompress.h [moved from include/asm-arm/arch-ixp4xx/uncompress.h with 96% similarity]
arch/arm/mach-ixp4xx/include/mach/vmalloc.h [moved from include/asm-arm/arch-ixp4xx/vmalloc.h with 50% similarity]
arch/arm/mach-ixp4xx/ixdp425-pci.c
arch/arm/mach-ixp4xx/ixdp425-setup.c
arch/arm/mach-ixp4xx/ixdpg425-pci.c
arch/arm/mach-ixp4xx/ixp4xx_npe.c
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
arch/arm/mach-ixp4xx/wg302v2-pci.c
arch/arm/mach-ixp4xx/wg302v2-setup.c
arch/arm/mach-kirkwood/addr-map.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/db88f6281-bp-setup.c
arch/arm/mach-kirkwood/include/mach/debug-macro.S [moved from include/asm-arm/arch-kirkwood/debug-macro.S with 84% similarity]
arch/arm/mach-kirkwood/include/mach/dma.h [moved from include/asm-arm/arch-kirkwood/dma.h with 100% similarity]
arch/arm/mach-kirkwood/include/mach/entry-macro.S [moved from include/asm-arm/arch-kirkwood/entry-macro.S with 92% similarity]
arch/arm/mach-kirkwood/include/mach/hardware.h [moved from include/asm-arm/arch-kirkwood/hardware.h with 90% similarity]
arch/arm/mach-kirkwood/include/mach/io.h [moved from include/asm-arm/arch-kirkwood/io.h with 92% similarity]
arch/arm/mach-kirkwood/include/mach/irqs.h [moved from include/asm-arm/arch-kirkwood/irqs.h with 97% similarity]
arch/arm/mach-kirkwood/include/mach/kirkwood.h [moved from include/asm-arm/arch-kirkwood/kirkwood.h with 98% similarity]
arch/arm/mach-kirkwood/include/mach/memory.h [moved from include/asm-arm/arch-mv78xx0/memory.h with 80% similarity]
arch/arm/mach-kirkwood/include/mach/system.h [moved from include/asm-arm/arch-mv78xx0/system.h with 84% similarity]
arch/arm/mach-kirkwood/include/mach/timex.h [moved from include/asm-arm/arch-kirkwood/timex.h with 85% similarity]
arch/arm/mach-kirkwood/include/mach/uncompress.h [moved from include/asm-arm/arch-kirkwood/uncompress.h with 91% similarity]
arch/arm/mach-kirkwood/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
arch/arm/mach-kirkwood/rd88f6281-setup.c
arch/arm/mach-ks8695/board-micrel.c
arch/arm/mach-ks8695/cpu.c
arch/arm/mach-ks8695/devices.c
arch/arm/mach-ks8695/gpio.c
arch/arm/mach-ks8695/include/mach/debug-macro.S [moved from include/asm-arm/arch-ks8695/debug-macro.S with 89% similarity]
arch/arm/mach-ks8695/include/mach/devices.h [moved from include/asm-arm/arch-ks8695/devices.h with 94% similarity]
arch/arm/mach-ks8695/include/mach/dma.h [moved from include/asm-arm/arch-ks8695/dma.h with 94% similarity]
arch/arm/mach-ks8695/include/mach/entry-macro.S [moved from include/asm-arm/arch-ks8695/entry-macro.S with 91% similarity]
arch/arm/mach-ks8695/include/mach/gpio.h [moved from include/asm-arm/arch-ks8695/gpio.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/hardware.h [moved from include/asm-arm/arch-ks8695/hardware.h with 95% similarity]
arch/arm/mach-ks8695/include/mach/io.h [moved from include/asm-arm/arch-ks8695/io.h with 90% similarity]
arch/arm/mach-ks8695/include/mach/irqs.h [moved from include/asm-arm/arch-ks8695/irqs.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/memory.h [moved from include/asm-arm/arch-ks8695/memory.h with 94% similarity]
arch/arm/mach-ks8695/include/mach/regs-gpio.h [moved from include/asm-arm/arch-ks8695/regs-gpio.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/regs-hpna.h [moved from include/asm-arm/arch-ks8695/regs-hpna.h with 91% similarity]
arch/arm/mach-ks8695/include/mach/regs-irq.h [moved from include/asm-arm/arch-ks8695/regs-irq.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/regs-lan.h [moved from include/asm-arm/arch-ks8695/regs-lan.h with 98% similarity]
arch/arm/mach-ks8695/include/mach/regs-mem.h [moved from include/asm-arm/arch-ks8695/regs-mem.h with 98% similarity]
arch/arm/mach-ks8695/include/mach/regs-misc.h [moved from include/asm-arm/arch-ks8695/regs-misc.h with 98% similarity]
arch/arm/mach-ks8695/include/mach/regs-pci.h [moved from include/asm-arm/arch-ks8695/regs-pci.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/regs-switch.h [moved from include/asm-arm/arch-ks8695/regs-switch.h with 97% similarity]
arch/arm/mach-ks8695/include/mach/regs-sys.h [moved from include/asm-arm/arch-ks8695/regs-sys.h with 95% similarity]
arch/arm/mach-ks8695/include/mach/regs-timer.h [moved from include/asm-arm/arch-ks8695/regs-timer.h with 95% similarity]
arch/arm/mach-ks8695/include/mach/regs-uart.h [moved from include/asm-arm/arch-ks8695/regs-uart.h with 98% similarity]
arch/arm/mach-ks8695/include/mach/regs-wan.h [moved from include/asm-arm/arch-ks8695/regs-wan.h with 98% similarity]
arch/arm/mach-ks8695/include/mach/system.h [moved from include/asm-arm/arch-ks8695/system.h with 92% similarity]
arch/arm/mach-ks8695/include/mach/timex.h [moved from include/asm-arm/arch-ks8695/timex.h with 90% similarity]
arch/arm/mach-ks8695/include/mach/uncompress.h [moved from include/asm-arm/arch-ks8695/uncompress.h with 90% similarity]
arch/arm/mach-ks8695/include/mach/vmalloc.h [moved from include/asm-arm/arch-ks8695/vmalloc.h with 90% similarity]
arch/arm/mach-ks8695/irq.c
arch/arm/mach-ks8695/leds.c
arch/arm/mach-ks8695/pci.c
arch/arm/mach-ks8695/time.c
arch/arm/mach-l7200/core.c
arch/arm/mach-l7200/include/mach/aux_reg.h [moved from include/asm-arm/arch-l7200/aux_reg.h with 88% similarity]
arch/arm/mach-l7200/include/mach/debug-macro.S [moved from include/asm-arm/arch-l7200/debug-macro.S with 95% similarity]
arch/arm/mach-l7200/include/mach/dma.h [moved from include/asm-arm/arch-l7200/dma.h with 91% similarity]
arch/arm/mach-l7200/include/mach/entry-macro.S [moved from include/asm-arm/arch-l7200/entry-macro.S with 91% similarity]
arch/arm/mach-l7200/include/mach/gp_timers.h [moved from include/asm-arm/arch-l7200/gp_timers.h with 92% similarity]
arch/arm/mach-l7200/include/mach/gpio.h [moved from include/asm-arm/arch-l7200/gpio.h with 98% similarity]
arch/arm/mach-l7200/include/mach/hardware.h [moved from include/asm-arm/arch-l7200/hardware.h with 97% similarity]
arch/arm/mach-l7200/include/mach/io.h [moved from include/asm-arm/arch-l7200/io.h with 75% similarity]
arch/arm/mach-l7200/include/mach/irqs.h [moved from include/asm-arm/arch-l7200/irqs.h with 98% similarity]
arch/arm/mach-l7200/include/mach/memory.h [moved from include/asm-arm/arch-l7200/memory.h with 93% similarity]
arch/arm/mach-l7200/include/mach/pmpcon.h [moved from include/asm-arm/arch-l7200/pmpcon.h with 96% similarity]
arch/arm/mach-l7200/include/mach/pmu.h [moved from include/asm-arm/arch-l7200/pmu.h with 99% similarity]
arch/arm/mach-l7200/include/mach/serial.h [moved from include/asm-arm/arch-l7200/serial.h with 95% similarity]
arch/arm/mach-l7200/include/mach/serial_l7200.h [moved from include/asm-arm/arch-l7200/serial_l7200.h with 97% similarity]
arch/arm/mach-l7200/include/mach/sib.h [moved from include/asm-arm/arch-l7200/sib.h with 99% similarity]
arch/arm/mach-l7200/include/mach/sys-clock.h [moved from include/asm-arm/arch-l7200/sys-clock.h with 97% similarity]
arch/arm/mach-l7200/include/mach/system.h [moved from include/asm-arm/arch-l7200/system.h with 86% similarity]
arch/arm/mach-l7200/include/mach/time.h [moved from include/asm-arm/arch-l7200/time.h with 96% similarity]
arch/arm/mach-l7200/include/mach/timex.h [moved from include/asm-arm/arch-l7200/timex.h with 91% similarity]
arch/arm/mach-l7200/include/mach/uncompress.h [moved from include/asm-arm/arch-l7200/uncompress.h with 91% similarity]
arch/arm/mach-l7200/include/mach/vmalloc.h [moved from include/asm-arm/arch-l7200/vmalloc.h with 56% similarity]
arch/arm/mach-lh7a40x/arch-kev7a400.c
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
arch/arm/mach-lh7a40x/clcd.c
arch/arm/mach-lh7a40x/clocks.c
arch/arm/mach-lh7a40x/include/mach/clocks.h [moved from include/asm-arm/arch-lh7a40x/clocks.h with 90% similarity]
arch/arm/mach-lh7a40x/include/mach/constants.h [moved from include/asm-arm/arch-lh7a40x/constants.h with 98% similarity]
arch/arm/mach-lh7a40x/include/mach/debug-macro.S [moved from include/asm-arm/arch-lh7a40x/debug-macro.S with 95% similarity]
arch/arm/mach-lh7a40x/include/mach/dma.h [moved from include/asm-arm/arch-lh7a40x/dma.h with 98% similarity]
arch/arm/mach-lh7a40x/include/mach/entry-macro.S [moved from include/asm-arm/arch-lh7a40x/entry-macro.S with 97% similarity]
arch/arm/mach-lh7a40x/include/mach/hardware.h [moved from include/asm-arm/arch-lh7a40x/hardware.h with 93% similarity]
arch/arm/mach-lh7a40x/include/mach/io.h [moved from include/asm-arm/arch-lh7a40x/io.h with 87% similarity]
arch/arm/mach-lh7a40x/include/mach/irqs.h [moved from include/asm-arm/arch-lh7a40x/irqs.h with 99% similarity]
arch/arm/mach-lh7a40x/include/mach/memory.h [moved from include/asm-arm/arch-lh7a40x/memory.h with 97% similarity]
arch/arm/mach-lh7a40x/include/mach/registers.h [moved from include/asm-arm/arch-lh7a40x/registers.h with 99% similarity]
arch/arm/mach-lh7a40x/include/mach/ssp.h [moved from include/asm-arm/arch-lh7a40x/ssp.h with 100% similarity]
arch/arm/mach-lh7a40x/include/mach/system.h [moved from include/asm-arm/arch-lh7a40x/system.h with 88% similarity]
arch/arm/mach-lh7a40x/include/mach/timex.h [moved from include/asm-arm/arch-lh7a40x/timex.h with 82% similarity]
arch/arm/mach-lh7a40x/include/mach/uncompress.h [moved from include/asm-arm/arch-lh7a40x/uncompress.h with 91% similarity]
arch/arm/mach-lh7a40x/include/mach/vmalloc.h [moved from include/asm-arm/arch-lh7a40x/vmalloc.h with 86% similarity]
arch/arm/mach-lh7a40x/irq-lh7a400.c
arch/arm/mach-lh7a40x/irq-lh7a404.c
arch/arm/mach-lh7a40x/irq-lpd7a40x.c
arch/arm/mach-lh7a40x/ssp-cpld.c
arch/arm/mach-lh7a40x/time.c
arch/arm/mach-loki/addr-map.c
arch/arm/mach-loki/common.c
arch/arm/mach-loki/include/mach/debug-macro.S [moved from include/asm-arm/arch-loki/debug-macro.S with 85% similarity]
arch/arm/mach-loki/include/mach/dma.h [moved from include/asm-arm/arch-loki/dma.h with 100% similarity]
arch/arm/mach-loki/include/mach/entry-macro.S [moved from include/asm-arm/arch-loki/entry-macro.S with 90% similarity]
arch/arm/mach-loki/include/mach/hardware.h [moved from include/asm-arm/arch-loki/hardware.h with 86% similarity]
arch/arm/mach-loki/include/mach/io.h [moved from include/asm-arm/arch-loki/io.h with 92% similarity]
arch/arm/mach-loki/include/mach/irqs.h [moved from include/asm-arm/arch-loki/irqs.h with 97% similarity]
arch/arm/mach-loki/include/mach/loki.h [moved from include/asm-arm/arch-loki/loki.h with 98% similarity]
arch/arm/mach-loki/include/mach/memory.h [moved from include/asm-arm/arch-kirkwood/memory.h with 81% similarity]
arch/arm/mach-loki/include/mach/system.h [moved from include/asm-arm/arch-loki/system.h with 85% similarity]
arch/arm/mach-loki/include/mach/timex.h [moved from include/asm-arm/arch-loki/timex.h with 86% similarity]
arch/arm/mach-loki/include/mach/uncompress.h [moved from include/asm-arm/arch-loki/uncompress.h with 91% similarity]
arch/arm/mach-loki/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-loki/lb88rc8480-setup.c
arch/arm/mach-msm/board-halibut.c
arch/arm/mach-msm/common.c
arch/arm/mach-msm/dma.c
arch/arm/mach-msm/idle.S
arch/arm/mach-msm/include/mach/board.h [moved from include/asm-arm/arch-msm/board.h with 95% similarity]
arch/arm/mach-msm/include/mach/debug-macro.S [moved from include/asm-arm/arch-msm/debug-macro.S with 89% similarity]
arch/arm/mach-msm/include/mach/dma.h [moved from include/asm-arm/arch-msm/dma.h with 98% similarity]
arch/arm/mach-msm/include/mach/entry-macro.S [moved from include/asm-arm/arch-msm/entry-macro.S with 92% similarity]
arch/arm/mach-msm/include/mach/hardware.h [moved from include/asm-arm/arch-msm/hardware.h with 92% similarity]
arch/arm/mach-msm/include/mach/io.h [moved from include/asm-arm/arch-msm/io.h with 95% similarity]
arch/arm/mach-msm/include/mach/irqs.h [moved from include/asm-arm/arch-msm/irqs.h with 98% similarity]
arch/arm/mach-msm/include/mach/memory.h [moved from include/asm-arm/arch-msm/memory.h with 94% similarity]
arch/arm/mach-msm/include/mach/msm_iomap.h [moved from include/asm-arm/arch-msm/msm_iomap.h with 98% similarity]
arch/arm/mach-msm/include/mach/system.h [moved from include/asm-arm/arch-msm/system.h with 89% similarity]
arch/arm/mach-msm/include/mach/timex.h [moved from include/asm-arm/arch-msm/timex.h with 93% similarity]
arch/arm/mach-msm/include/mach/uncompress.h [moved from include/asm-arm/arch-msm/uncompress.h with 93% similarity]
arch/arm/mach-msm/include/mach/vmalloc.h [moved from include/asm-arm/arch-msm/vmalloc.h with 93% similarity]
arch/arm/mach-msm/io.c
arch/arm/mach-msm/irq.c
arch/arm/mach-msm/timer.c
arch/arm/mach-mv78xx0/common.c
arch/arm/mach-mv78xx0/db78x00-bp-setup.c
arch/arm/mach-mv78xx0/include/mach/debug-macro.S [moved from include/asm-arm/arch-mv78xx0/debug-macro.S with 84% similarity]
arch/arm/mach-mv78xx0/include/mach/dma.h [moved from include/asm-arm/arch-mv78xx0/dma.h with 100% similarity]
arch/arm/mach-mv78xx0/include/mach/entry-macro.S [moved from include/asm-arm/arch-mv78xx0/entry-macro.S with 92% similarity]
arch/arm/mach-mv78xx0/include/mach/hardware.h [moved from include/asm-arm/arch-mv78xx0/hardware.h with 90% similarity]
arch/arm/mach-mv78xx0/include/mach/io.h [moved from include/asm-arm/arch-mv78xx0/io.h with 92% similarity]
arch/arm/mach-mv78xx0/include/mach/irqs.h [moved from include/asm-arm/arch-mv78xx0/irqs.h with 98% similarity]
arch/arm/mach-mv78xx0/include/mach/memory.h [moved from include/asm-arm/arch-loki/memory.h with 80% similarity]
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h [moved from include/asm-arm/arch-mv78xx0/mv78xx0.h with 98% similarity]
arch/arm/mach-mv78xx0/include/mach/system.h [moved from include/asm-arm/arch-kirkwood/system.h with 84% similarity]
arch/arm/mach-mv78xx0/include/mach/timex.h [moved from include/asm-arm/arch-mv78xx0/timex.h with 83% similarity]
arch/arm/mach-mv78xx0/include/mach/uncompress.h [moved from include/asm-arm/arch-mv78xx0/uncompress.h with 91% similarity]
arch/arm/mach-mv78xx0/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-mv78xx0/irq.c
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/cpu_imx27.c
arch/arm/mach-mx2/crm_regs.h
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/generic.c
arch/arm/mach-mx2/mx27ads.c
arch/arm/mach-mx2/pcm038.c
arch/arm/mach-mx2/pcm970-baseboard.c
arch/arm/mach-mx2/serial.c
arch/arm/mach-mx2/system.c
arch/arm/mach-mx3/clock.c
arch/arm/mach-mx3/devices.c
arch/arm/mach-mx3/iomux.c
arch/arm/mach-mx3/mm.c
arch/arm/mach-mx3/mx31ads.c
arch/arm/mach-mx3/mx31lite.c
arch/arm/mach-mx3/pcm037.c
arch/arm/mach-netx/fb.c
arch/arm/mach-netx/generic.c
arch/arm/mach-netx/include/mach/debug-macro.S [moved from include/asm-arm/arch-netx/debug-macro.S with 94% similarity]
arch/arm/mach-netx/include/mach/dma.h [moved from include/asm-arm/arch-netx/dma.h with 94% similarity]
arch/arm/mach-netx/include/mach/entry-macro.S [moved from include/asm-arm/arch-netx/entry-macro.S with 93% similarity]
arch/arm/mach-netx/include/mach/eth.h [moved from include/asm-arm/arch-netx/eth.h with 95% similarity]
arch/arm/mach-netx/include/mach/hardware.h [moved from include/asm-arm/arch-netx/hardware.h with 96% similarity]
arch/arm/mach-netx/include/mach/io.h [moved from include/asm-arm/arch-netx/io.h with 95% similarity]
arch/arm/mach-netx/include/mach/irqs.h [moved from include/asm-arm/arch-netx/irqs.h with 98% similarity]
arch/arm/mach-netx/include/mach/memory.h [moved from include/asm-arm/arch-netx/memory.h with 96% similarity]
arch/arm/mach-netx/include/mach/netx-regs.h [moved from include/asm-arm/arch-netx/netx-regs.h with 99% similarity]
arch/arm/mach-netx/include/mach/param.h [moved from include/asm-arm/arch-netx/param.h with 94% similarity]
arch/arm/mach-netx/include/mach/pfifo.h [moved from include/asm-arm/arch-netx/pfifo.h with 96% similarity]
arch/arm/mach-netx/include/mach/system.h [moved from include/asm-arm/arch-netx/system.h with 93% similarity]
arch/arm/mach-netx/include/mach/timex.h [moved from include/asm-arm/arch-netx/timex.h with 94% similarity]
arch/arm/mach-netx/include/mach/uncompress.h [moved from include/asm-arm/arch-netx/uncompress.h with 97% similarity]
arch/arm/mach-netx/include/mach/vmalloc.h [moved from include/asm-arm/arch-netx/vmalloc.h with 94% similarity]
arch/arm/mach-netx/include/mach/xc.h [moved from include/asm-arm/arch-netx/xc.h with 96% similarity]
arch/arm/mach-netx/nxdb500.c
arch/arm/mach-netx/nxdkn.c
arch/arm/mach-netx/nxeb500hmi.c
arch/arm/mach-netx/pfifo.c
arch/arm/mach-netx/time.c
arch/arm/mach-netx/xc.c
arch/arm/mach-ns9xxx/board-a9m9750dev.c
arch/arm/mach-ns9xxx/gpio-ns9360.c
arch/arm/mach-ns9xxx/gpio.c
arch/arm/mach-ns9xxx/include/mach/board.h [moved from include/asm-arm/arch-ns9xxx/board.h with 95% similarity]
arch/arm/mach-ns9xxx/include/mach/debug-macro.S [moved from include/asm-arm/arch-ns9xxx/debug-macro.S with 80% similarity]
arch/arm/mach-ns9xxx/include/mach/dma.h [moved from include/asm-arm/arch-ns9xxx/dma.h with 89% similarity]
arch/arm/mach-ns9xxx/include/mach/entry-macro.S [moved from include/asm-arm/arch-ns9xxx/entry-macro.S with 83% similarity]
arch/arm/mach-ns9xxx/include/mach/gpio.h [moved from include/asm-arm/arch-ns9xxx/gpio.h with 95% similarity]
arch/arm/mach-ns9xxx/include/mach/hardware.h [moved from include/asm-arm/arch-ns9xxx/hardware.h with 97% similarity]
arch/arm/mach-ns9xxx/include/mach/io.h [moved from include/asm-arm/arch-ns9xxx/io.h with 92% similarity]
arch/arm/mach-ns9xxx/include/mach/irqs.h [moved from include/asm-arm/arch-ns9xxx/irqs.h with 98% similarity]
arch/arm/mach-ns9xxx/include/mach/memory.h [moved from include/asm-arm/arch-ns9xxx/memory.h with 93% similarity]
arch/arm/mach-ns9xxx/include/mach/module.h [moved from include/asm-arm/arch-ns9xxx/module.h with 96% similarity]
arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h [moved from include/asm-arm/arch-ns9xxx/processor-ns9360.h with 93% similarity]
arch/arm/mach-ns9xxx/include/mach/processor.h [moved from include/asm-arm/arch-ns9xxx/processor.h with 92% similarity]
arch/arm/mach-ns9xxx/include/mach/regs-bbu.h [moved from include/asm-arm/arch-ns9xxx/regs-bbu.h with 95% similarity]
arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h [moved from include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h with 89% similarity]
arch/arm/mach-ns9xxx/include/mach/regs-mem.h [moved from include/asm-arm/arch-ns9xxx/regs-mem.h with 98% similarity]
arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h [moved from include/asm-arm/arch-ns9xxx/regs-sys-common.h with 90% similarity]
arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h [moved from include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h with 98% similarity]
arch/arm/mach-ns9xxx/include/mach/system.h [moved from include/asm-arm/arch-ns9xxx/system.h with 84% similarity]
arch/arm/mach-ns9xxx/include/mach/timex.h [moved from include/asm-arm/arch-ns9xxx/timex.h with 77% similarity]
arch/arm/mach-ns9xxx/include/mach/uncompress.h [moved from include/asm-arm/arch-ns9xxx/uncompress.h with 98% similarity]
arch/arm/mach-ns9xxx/include/mach/vmalloc.h [moved from include/asm-arm/arch-ns9xxx/vmalloc.h with 89% similarity]
arch/arm/mach-ns9xxx/irq.c
arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
arch/arm/mach-ns9xxx/mach-cc9p9360js.c
arch/arm/mach-ns9xxx/plat-serial8250.c
arch/arm/mach-ns9xxx/processor-ns9360.c
arch/arm/mach-ns9xxx/time-ns9360.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2-mmc.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3-mmc.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-sx1-mmc.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/fpga.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap1/irq.c
arch/arm/mach-omap1/leds-h2p2-debug.c
arch/arm/mach-omap1/leds-innovator.c
arch/arm/mach-omap1/leds-osk.c
arch/arm/mach-omap1/leds.c
arch/arm/mach-omap1/mailbox.c
arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap1/mux.c
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap1/serial.c
arch/arm/mach-omap1/sleep.S
arch/arm/mach-omap1/sram.S
arch/arm/mach-omap1/time.c
arch/arm/mach-omap1/timer32k.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock.h
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/mailbox.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/prcm.c
arch/arm/mach-omap2/sdrc.h
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/sleep.S
arch/arm/mach-omap2/sram242x.S
arch/arm/mach-omap2/sram243x.S
arch/arm/mach-omap2/timer-gp.c
arch/arm/mach-omap2/usb-tusb6010.c
arch/arm/mach-orion5x/addr-map.c
arch/arm/mach-orion5x/common.c
arch/arm/mach-orion5x/db88f5281-setup.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-orion5x/gpio.c
arch/arm/mach-orion5x/include/mach/debug-macro.S [moved from include/asm-arm/arch-orion5x/debug-macro.S with 85% similarity]
arch/arm/mach-orion5x/include/mach/dma.h [moved from include/asm-arm/arch-orion5x/dma.h with 100% similarity]
arch/arm/mach-orion5x/include/mach/entry-macro.S [moved from include/asm-arm/arch-orion5x/entry-macro.S with 90% similarity]
arch/arm/mach-orion5x/include/mach/gpio.h [moved from include/asm-arm/arch-orion5x/gpio.h with 94% similarity]
arch/arm/mach-orion5x/include/mach/hardware.h [moved from include/asm-arm/arch-orion5x/hardware.h with 90% similarity]
arch/arm/mach-orion5x/include/mach/io.h [moved from include/asm-arm/arch-orion5x/io.h with 97% similarity]
arch/arm/mach-orion5x/include/mach/irqs.h [moved from include/asm-arm/arch-orion5x/irqs.h with 97% similarity]
arch/arm/mach-orion5x/include/mach/memory.h [moved from include/asm-arm/arch-orion5x/memory.h with 83% similarity]
arch/arm/mach-orion5x/include/mach/orion5x.h [moved from include/asm-arm/arch-orion5x/orion5x.h with 99% similarity]
arch/arm/mach-orion5x/include/mach/system.h [moved from include/asm-arm/arch-orion5x/system.h with 83% similarity]
arch/arm/mach-orion5x/include/mach/timex.h [moved from include/asm-arm/arch-orion5x/timex.h with 87% similarity]
arch/arm/mach-orion5x/include/mach/uncompress.h [moved from include/asm-arm/arch-orion5x/uncompress.h with 91% similarity]
arch/arm/mach-orion5x/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-orion5x/irq.c
arch/arm/mach-orion5x/kurobox_pro-setup.c
arch/arm/mach-orion5x/mpp.c
arch/arm/mach-orion5x/mss2-setup.c
arch/arm/mach-orion5x/mv2120-setup.c
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
arch/arm/mach-orion5x/rd88f5182-setup.c
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/mach-orion5x/ts409-setup.c
arch/arm/mach-orion5x/ts78xx-setup.c
arch/arm/mach-orion5x/wnr854t-setup.c
arch/arm/mach-orion5x/wrt350n-v2-setup.c
arch/arm/mach-pnx4008/clock.c
arch/arm/mach-pnx4008/core.c
arch/arm/mach-pnx4008/dma.c
arch/arm/mach-pnx4008/gpio.c
arch/arm/mach-pnx4008/i2c.c
arch/arm/mach-pnx4008/include/mach/clock.h [moved from include/asm-arm/arch-pnx4008/clock.h with 97% similarity]
arch/arm/mach-pnx4008/include/mach/debug-macro.S [moved from include/asm-arm/arch-pnx4008/debug-macro.S with 91% similarity]
arch/arm/mach-pnx4008/include/mach/dma.h [moved from include/asm-arm/arch-pnx4008/dma.h with 98% similarity]
arch/arm/mach-pnx4008/include/mach/entry-macro.S [moved from include/asm-arm/arch-pnx4008/entry-macro.S with 98% similarity]
arch/arm/mach-pnx4008/include/mach/gpio.h [moved from include/asm-arm/arch-pnx4008/gpio.h with 99% similarity]
arch/arm/mach-pnx4008/include/mach/hardware.h [moved from include/asm-arm/arch-pnx4008/hardware.h with 93% similarity]
arch/arm/mach-pnx4008/include/mach/i2c.h [moved from include/asm-arm/arch-pnx4008/i2c.h with 100% similarity]
arch/arm/mach-pnx4008/include/mach/io.h [moved from include/asm-arm/arch-pnx4008/io.h with 91% similarity]
arch/arm/mach-pnx4008/include/mach/irq.h [moved from include/asm-arm/arch-pnx4008/irq.h with 97% similarity]
arch/arm/mach-pnx4008/include/mach/irqs.h [moved from include/asm-arm/arch-pnx4008/irqs.h with 99% similarity]
arch/arm/mach-pnx4008/include/mach/memory.h [moved from include/asm-arm/arch-pnx4008/memory.h with 92% similarity]
arch/arm/mach-pnx4008/include/mach/param.h [moved from include/asm-arm/arch-pnx4008/param.h with 94% similarity]
arch/arm/mach-pnx4008/include/mach/platform.h [moved from include/asm-arm/arch-pnx4008/platform.h with 98% similarity]
arch/arm/mach-pnx4008/include/mach/pm.h [moved from include/asm-arm/arch-pnx4008/pm.h with 95% similarity]
arch/arm/mach-pnx4008/include/mach/system.h [moved from include/asm-arm/arch-pnx4008/system.h with 90% similarity]
arch/arm/mach-pnx4008/include/mach/timex.h [moved from include/asm-arm/arch-pnx4008/timex.h with 96% similarity]
arch/arm/mach-pnx4008/include/mach/uncompress.h [moved from include/asm-arm/arch-pnx4008/uncompress.h with 95% similarity]
arch/arm/mach-pnx4008/include/mach/vmalloc.h [moved from include/asm-arm/arch-pnx4008/vmalloc.h with 93% similarity]
arch/arm/mach-pnx4008/irq.c
arch/arm/mach-pnx4008/pm.c
arch/arm/mach-pnx4008/serial.c
arch/arm/mach-pnx4008/sleep.S
arch/arm/mach-pnx4008/time.c
arch/arm/mach-pxa/akita-ioexp.c
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/cm-x270-pci.c
arch/arm/mach-pxa/cm-x270.c
arch/arm/mach-pxa/colibri.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/corgi_lcd.c
arch/arm/mach-pxa/corgi_pm.c
arch/arm/mach-pxa/corgi_ssp.c
arch/arm/mach-pxa/cpu-pxa.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/dma.c
arch/arm/mach-pxa/e400_lcd.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/eseries.c
arch/arm/mach-pxa/eseries_udc.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/gpio.c
arch/arm/mach-pxa/gumstix.c
arch/arm/mach-pxa/idp.c
arch/arm/mach-pxa/include/mach/akita.h [moved from include/asm-arm/arch-pxa/akita.h with 100% similarity]
arch/arm/mach-pxa/include/mach/audio.h [moved from include/asm-arm/arch-pxa/audio.h with 100% similarity]
arch/arm/mach-pxa/include/mach/bitfield.h [moved from include/asm-arm/arch-pxa/bitfield.h with 100% similarity]
arch/arm/mach-pxa/include/mach/camera.h [moved from include/asm-arm/arch-pxa/camera.h with 100% similarity]
arch/arm/mach-pxa/include/mach/colibri.h [moved from include/asm-arm/arch-pxa/colibri.h with 100% similarity]
arch/arm/mach-pxa/include/mach/corgi.h [moved from include/asm-arm/arch-pxa/corgi.h with 100% similarity]
arch/arm/mach-pxa/include/mach/debug-macro.S [moved from include/asm-arm/arch-pxa/debug-macro.S with 92% similarity]
arch/arm/mach-pxa/include/mach/dma.h [moved from include/asm-arm/arch-pxa/dma.h with 96% similarity]
arch/arm/mach-pxa/include/mach/entry-macro.S [moved from include/asm-arm/arch-pxa/entry-macro.S with 92% similarity]
arch/arm/mach-pxa/include/mach/eseries-gpio.h [moved from include/asm-arm/arch-pxa/eseries-gpio.h with 100% similarity]
arch/arm/mach-pxa/include/mach/eseries-irq.h [moved from include/asm-arm/arch-pxa/eseries-irq.h with 100% similarity]
arch/arm/mach-pxa/include/mach/gpio.h [moved from include/asm-arm/arch-pxa/gpio.h with 94% similarity]
arch/arm/mach-pxa/include/mach/gumstix.h [moved from include/asm-arm/arch-pxa/gumstix.h with 98% similarity]
arch/arm/mach-pxa/include/mach/hardware.h [moved from include/asm-arm/arch-pxa/hardware.h with 99% similarity]
arch/arm/mach-pxa/include/mach/i2c.h [moved from include/asm-arm/arch-pxa/i2c.h with 100% similarity]
arch/arm/mach-pxa/include/mach/idp.h [moved from include/asm-arm/arch-pxa/idp.h with 99% similarity]
arch/arm/mach-pxa/include/mach/io.h [moved from include/asm-arm/arch-pxa/io.h with 83% similarity]
arch/arm/mach-pxa/include/mach/irda.h [moved from include/asm-arm/arch-pxa/irda.h with 100% similarity]
arch/arm/mach-pxa/include/mach/irqs.h [moved from include/asm-arm/arch-pxa/irqs.h with 99% similarity]
arch/arm/mach-pxa/include/mach/littleton.h [moved from include/asm-arm/arch-pxa/littleton.h with 100% similarity]
arch/arm/mach-pxa/include/mach/lpd270.h [moved from include/asm-arm/arch-pxa/lpd270.h with 96% similarity]
arch/arm/mach-pxa/include/mach/lubbock.h [moved from include/asm-arm/arch-pxa/lubbock.h with 96% similarity]
arch/arm/mach-pxa/include/mach/magician.h [moved from include/asm-arm/arch-pxa/magician.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mainstone.h [moved from include/asm-arm/arch-pxa/mainstone.h with 99% similarity]
arch/arm/mach-pxa/include/mach/memory.h [moved from include/asm-arm/arch-pxa/memory.h with 97% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h [moved from include/asm-arm/arch-pxa/mfp-pxa25x.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h [moved from include/asm-arm/arch-pxa/mfp-pxa27x.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h [moved from include/asm-arm/arch-pxa/mfp-pxa2xx.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa300.h [moved from include/asm-arm/arch-pxa/mfp-pxa300.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa320.h [moved from include/asm-arm/arch-pxa/mfp-pxa320.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h [moved from include/asm-arm/arch-pxa/mfp-pxa3xx.h with 100% similarity]
arch/arm/mach-pxa/include/mach/mfp-pxa930.h [moved from include/asm-arm/arch-pxa/mfp-pxa930.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mfp.h [moved from include/asm-arm/arch-pxa/mfp.h with 99% similarity]
arch/arm/mach-pxa/include/mach/mmc.h [moved from include/asm-arm/arch-pxa/mmc.h with 100% similarity]
arch/arm/mach-pxa/include/mach/mtd-xip.h [moved from include/asm-arm/arch-pxa/mtd-xip.h with 97% similarity]
arch/arm/mach-pxa/include/mach/ohci.h [moved from include/asm-arm/arch-pxa/ohci.h with 100% similarity]
arch/arm/mach-pxa/include/mach/palmtx.h [moved from include/asm-arm/arch-pxa/palmtx.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pcm027.h [moved from include/asm-arm/arch-pxa/pcm027.h with 98% similarity]
arch/arm/mach-pxa/include/mach/pcm990_baseboard.h [moved from include/asm-arm/arch-pxa/pcm990_baseboard.h with 99% similarity]
arch/arm/mach-pxa/include/mach/pm.h [moved from include/asm-arm/arch-pxa/pm.h with 100% similarity]
arch/arm/mach-pxa/include/mach/poodle.h [moved from include/asm-arm/arch-pxa/poodle.h with 96% similarity]
arch/arm/mach-pxa/include/mach/pxa-regs.h [moved from include/asm-arm/arch-pxa/pxa-regs.h with 99% similarity]
arch/arm/mach-pxa/include/mach/pxa25x-udc.h [moved from include/asm-arm/arch-pxa/pxa25x-udc.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxa27x-udc.h [moved from include/asm-arm/arch-pxa/pxa27x-udc.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxa27x_keypad.h [moved from include/asm-arm/arch-pxa/pxa27x_keypad.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h [moved from include/asm-arm/arch-pxa/pxa2xx-gpio.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxa2xx-regs.h [moved from include/asm-arm/arch-pxa/pxa2xx-regs.h with 99% similarity]
arch/arm/mach-pxa/include/mach/pxa2xx_spi.h [moved from include/asm-arm/arch-pxa/pxa2xx_spi.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h [moved from include/asm-arm/arch-pxa/pxa3xx-regs.h with 99% similarity]
arch/arm/mach-pxa/include/mach/pxa3xx_nand.h [moved from include/asm-arm/arch-pxa/pxa3xx_nand.h with 100% similarity]
arch/arm/mach-pxa/include/mach/pxafb.h [moved from include/asm-arm/arch-pxa/pxafb.h with 98% similarity]
arch/arm/mach-pxa/include/mach/regs-lcd.h [moved from include/asm-arm/arch-pxa/regs-lcd.h with 99% similarity]
arch/arm/mach-pxa/include/mach/regs-ssp.h [moved from include/asm-arm/arch-pxa/regs-ssp.h with 100% similarity]
arch/arm/mach-pxa/include/mach/sharpsl.h [moved from include/asm-arm/arch-pxa/sharpsl.h with 100% similarity]
arch/arm/mach-pxa/include/mach/spitz.h [moved from include/asm-arm/arch-pxa/spitz.h with 100% similarity]
arch/arm/mach-pxa/include/mach/ssp.h [moved from include/asm-arm/arch-pxa/ssp.h with 100% similarity]
arch/arm/mach-pxa/include/mach/system.h [moved from include/asm-arm/arch-pxa/system.h with 91% similarity]
arch/arm/mach-pxa/include/mach/timex.h [moved from include/asm-arm/arch-pxa/timex.h with 93% similarity]
arch/arm/mach-pxa/include/mach/tosa.h [moved from include/asm-arm/arch-pxa/tosa.h with 100% similarity]
arch/arm/mach-pxa/include/mach/tosa_bt.h [moved from include/asm-arm/arch-pxa/tosa_bt.h with 100% similarity]
arch/arm/mach-pxa/include/mach/trizeps4.h [moved from include/asm-arm/arch-pxa/trizeps4.h with 100% similarity]
arch/arm/mach-pxa/include/mach/udc.h [moved from include/asm-arm/arch-pxa/udc.h with 73% similarity]
arch/arm/mach-pxa/include/mach/uncompress.h [moved from include/asm-arm/arch-pxa/uncompress.h with 91% similarity]
arch/arm/mach-pxa/include/mach/vmalloc.h [moved from include/asm-arm/arch-pxa/vmalloc.h with 87% similarity]
arch/arm/mach-pxa/include/mach/zylonite.h [moved from include/asm-arm/arch-pxa/zylonite.h with 100% similarity]
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/leds-idp.c
arch/arm/mach-pxa/leds-lubbock.c
arch/arm/mach-pxa/leds-mainstone.c
arch/arm/mach-pxa/leds-trizeps4.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/mfp-pxa2xx.c
arch/arm/mach-pxa/mfp-pxa3xx.c
arch/arm/mach-pxa/palmtx.c
arch/arm/mach-pxa/pcm027.c
arch/arm/mach-pxa/pcm990-baseboard.c
arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/pwm.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa2xx.c
arch/arm/mach-pxa/pxa300.c
arch/arm/mach-pxa/pxa320.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/pxa930.c
arch/arm/mach-pxa/reset.c
arch/arm/mach-pxa/saar.c
arch/arm/mach-pxa/sharpsl_pm.c
arch/arm/mach-pxa/sleep.S
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/spitz_pm.c
arch/arm/mach-pxa/ssp.c
arch/arm/mach-pxa/standby.S
arch/arm/mach-pxa/tavorevb.c
arch/arm/mach-pxa/time.c
arch/arm/mach-pxa/tosa-bt.c
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/trizeps4.c
arch/arm/mach-pxa/zylonite.c
arch/arm/mach-pxa/zylonite_pxa300.c
arch/arm/mach-pxa/zylonite_pxa320.c
arch/arm/mach-realview/core.c
arch/arm/mach-realview/include/mach/board-eb.h [moved from include/asm-arm/arch-realview/board-eb.h with 99% similarity]
arch/arm/mach-realview/include/mach/board-pb1176.h [moved from include/asm-arm/arch-realview/board-pb1176.h with 98% similarity]
arch/arm/mach-realview/include/mach/board-pb11mp.h [moved from include/asm-arm/arch-realview/board-pb11mp.h with 99% similarity]
arch/arm/mach-realview/include/mach/debug-macro.S [moved from include/asm-arm/arch-realview/debug-macro.S with 91% similarity]
arch/arm/mach-realview/include/mach/dma.h [moved from include/asm-arm/arch-realview/dma.h with 94% similarity]
arch/arm/mach-realview/include/mach/entry-macro.S [moved from include/asm-arm/arch-realview/entry-macro.S with 96% similarity]
arch/arm/mach-realview/include/mach/hardware.h [moved from include/asm-arm/arch-realview/hardware.h with 95% similarity]
arch/arm/mach-realview/include/mach/io.h [moved from include/asm-arm/arch-realview/io.h with 95% similarity]
arch/arm/mach-realview/include/mach/irqs.h [moved from include/asm-arm/arch-realview/irqs.h with 87% similarity]
arch/arm/mach-realview/include/mach/memory.h [moved from include/asm-arm/arch-realview/memory.h with 96% similarity]
arch/arm/mach-realview/include/mach/platform.h [moved from include/asm-arm/arch-realview/platform.h with 99% similarity]
arch/arm/mach-realview/include/mach/scu.h [moved from include/asm-arm/arch-realview/scu.h with 100% similarity]
arch/arm/mach-realview/include/mach/smp.h [moved from include/asm-arm/arch-realview/smp.h with 100% similarity]
arch/arm/mach-realview/include/mach/system.h [moved from include/asm-arm/arch-realview/system.h with 92% similarity]
arch/arm/mach-realview/include/mach/timex.h [moved from include/asm-arm/arch-realview/timex.h with 94% similarity]
arch/arm/mach-realview/include/mach/uncompress.h [moved from include/asm-arm/arch-realview/uncompress.h with 90% similarity]
arch/arm/mach-realview/include/mach/vmalloc.h [moved from include/asm-arm/arch-realview/vmalloc.h with 94% similarity]
arch/arm/mach-realview/localtimer.c
arch/arm/mach-realview/platsmp.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-rpc/dma.c
arch/arm/mach-rpc/include/mach/acornfb.h [moved from include/asm-arm/arch-rpc/acornfb.h with 98% similarity]
arch/arm/mach-rpc/include/mach/debug-macro.S [moved from include/asm-arm/arch-rpc/debug-macro.S with 92% similarity]
arch/arm/mach-rpc/include/mach/dma.h [moved from include/asm-arm/arch-rpc/dma.h with 94% similarity]
arch/arm/mach-rpc/include/mach/entry-macro.S [moved from include/asm-arm/arch-cl7500/entry-macro.S with 91% similarity]
arch/arm/mach-rpc/include/mach/hardware.h [moved from include/asm-arm/arch-rpc/hardware.h with 96% similarity]
arch/arm/mach-rpc/include/mach/io.h [moved from include/asm-arm/arch-rpc/io.h with 98% similarity]
arch/arm/mach-rpc/include/mach/irqs.h [moved from include/asm-arm/arch-rpc/irqs.h with 95% similarity]
arch/arm/mach-rpc/include/mach/memory.h [moved from include/asm-arm/arch-rpc/memory.h with 95% similarity]
arch/arm/mach-rpc/include/mach/system.h [moved from include/asm-arm/arch-rpc/system.h with 86% similarity]
arch/arm/mach-rpc/include/mach/timex.h [moved from include/asm-arm/arch-rpc/timex.h with 89% similarity]
arch/arm/mach-rpc/include/mach/uncompress.h [moved from include/asm-arm/arch-rpc/uncompress.h with 98% similarity]
arch/arm/mach-rpc/include/mach/vmalloc.h [moved from include/asm-arm/arch-rpc/vmalloc.h with 86% similarity]
arch/arm/mach-rpc/riscpc.c
arch/arm/mach-s3c2400/gpio.c
arch/arm/mach-s3c2400/include/mach/map.h [moved from include/asm-arm/arch-s3c2400/map.h with 98% similarity]
arch/arm/mach-s3c2400/include/mach/memory.h [moved from include/asm-arm/arch-s3c2400/memory.h with 84% similarity]
arch/arm/mach-s3c2410/bast-ide.c
arch/arm/mach-s3c2410/bast-irq.c
arch/arm/mach-s3c2410/clock.c
arch/arm/mach-s3c2410/dma.c
arch/arm/mach-s3c2410/gpio.c
arch/arm/mach-s3c2410/h1940-bluetooth.c
arch/arm/mach-s3c2410/include/mach/anubis-cpld.h [moved from include/asm-arm/arch-s3c2410/anubis-cpld.h with 92% similarity]
arch/arm/mach-s3c2410/include/mach/anubis-irq.h [moved from include/asm-arm/arch-s3c2410/anubis-irq.h with 91% similarity]
arch/arm/mach-s3c2410/include/mach/anubis-map.h [moved from include/asm-arm/arch-s3c2410/anubis-map.h with 95% similarity]
arch/arm/mach-s3c2410/include/mach/audio.h [moved from include/asm-arm/arch-s3c2410/audio.h with 96% similarity]
arch/arm/mach-s3c2410/include/mach/bast-cpld.h [moved from include/asm-arm/arch-s3c2410/bast-cpld.h with 96% similarity]
arch/arm/mach-s3c2410/include/mach/bast-irq.h [moved from include/asm-arm/arch-s3c2410/bast-irq.h with 94% similarity]
arch/arm/mach-s3c2410/include/mach/bast-map.h [moved from include/asm-arm/arch-s3c2410/bast-map.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/bast-pmu.h [moved from include/asm-arm/arch-s3c2410/bast-pmu.h with 95% similarity]
arch/arm/mach-s3c2410/include/mach/debug-macro.S [moved from include/asm-arm/arch-s3c2410/debug-macro.S with 96% similarity]
arch/arm/mach-s3c2410/include/mach/dma.h [moved from include/asm-arm/arch-s3c2410/dma.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/entry-macro.S [moved from include/asm-arm/arch-s3c2410/entry-macro.S with 95% similarity]
arch/arm/mach-s3c2410/include/mach/fb.h [moved from include/asm-arm/arch-s3c2410/fb.h with 96% similarity]
arch/arm/mach-s3c2410/include/mach/gpio.h [moved from include/asm-arm/arch-s3c2410/gpio.h with 91% similarity]
arch/arm/mach-s3c2410/include/mach/h1940-latch.h [moved from include/asm-arm/arch-s3c2410/h1940-latch.h with 97% similarity]
arch/arm/mach-s3c2410/include/mach/h1940.h [moved from include/asm-arm/arch-s3c2410/h1940.h with 91% similarity]
arch/arm/mach-s3c2410/include/mach/hardware.h [moved from include/asm-arm/arch-s3c2410/hardware.h with 97% similarity]
arch/arm/mach-s3c2410/include/mach/idle.h [moved from include/asm-arm/arch-s3c2410/idle.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/io.h [moved from include/asm-arm/arch-s3c2410/io.h with 98% similarity]
arch/arm/mach-s3c2410/include/mach/irqs.h [moved from include/asm-arm/arch-s3c2410/irqs.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/leds-gpio.h [moved from include/asm-arm/arch-s3c2410/leds-gpio.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/map.h [moved from include/asm-arm/arch-s3c2410/map.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/memory.h [moved from include/asm-arm/arch-s3c2410/memory.h with 81% similarity]
arch/arm/mach-s3c2410/include/mach/osiris-cpld.h [moved from include/asm-arm/arch-s3c2410/osiris-cpld.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/osiris-map.h [moved from include/asm-arm/arch-s3c2410/osiris-map.h with 95% similarity]
arch/arm/mach-s3c2410/include/mach/otom-map.h [moved from include/asm-arm/arch-s3c2410/otom-map.h with 94% similarity]
arch/arm/mach-s3c2410/include/mach/regs-clock.h [moved from include/asm-arm/arch-s3c2410/regs-clock.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-dsc.h [moved from include/asm-arm/arch-s3c2410/regs-dsc.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-gpio.h [moved from include/asm-arm/arch-s3c2410/regs-gpio.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-gpioj.h [moved from include/asm-arm/arch-s3c2410/regs-gpioj.h with 98% similarity]
arch/arm/mach-s3c2410/include/mach/regs-irq.h [moved from include/asm-arm/arch-s3c2410/regs-irq.h with 96% similarity]
arch/arm/mach-s3c2410/include/mach/regs-lcd.h [moved from include/asm-arm/arch-s3c2410/regs-lcd.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-mem.h [moved from include/asm-arm/arch-s3c2410/regs-mem.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-power.h [moved from include/asm-arm/arch-s3c2410/regs-power.h with 96% similarity]
arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h [moved from include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h [moved from include/asm-arm/arch-s3c2410/regs-s3c2412.h with 92% similarity]
arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h [moved from include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/regs-sdi.h [moved from include/asm-arm/arch-s3c2410/regs-sdi.h with 99% similarity]
arch/arm/mach-s3c2410/include/mach/reset.h [moved from include/asm-arm/arch-s3c2410/reset.h with 92% similarity]
arch/arm/mach-s3c2410/include/mach/spi-gpio.h [moved from include/asm-arm/arch-s3c2410/spi-gpio.h with 92% similarity]
arch/arm/mach-s3c2410/include/mach/spi.h [moved from include/asm-arm/arch-s3c2410/spi.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/system-reset.h [moved from include/asm-arm/arch-s3c2410/system-reset.h with 92% similarity]
arch/arm/mach-s3c2410/include/mach/system.h [moved from include/asm-arm/arch-s3c2410/system.h with 83% similarity]
arch/arm/mach-s3c2410/include/mach/timex.h [moved from include/asm-arm/arch-s3c2410/timex.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/uncompress.h [moved from include/asm-arm/arch-s3c2410/uncompress.h with 91% similarity]
arch/arm/mach-s3c2410/include/mach/usb-control.h [moved from include/asm-arm/arch-s3c2410/usb-control.h with 87% similarity]
arch/arm/mach-s3c2410/include/mach/vmalloc.h [moved from include/asm-arm/arch-s3c2410/vmalloc.h with 82% similarity]
arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h [moved from include/asm-arm/arch-s3c2410/vr1000-cpld.h with 90% similarity]
arch/arm/mach-s3c2410/include/mach/vr1000-irq.h [moved from include/asm-arm/arch-s3c2410/vr1000-irq.h with 93% similarity]
arch/arm/mach-s3c2410/include/mach/vr1000-map.h [moved from include/asm-arm/arch-s3c2410/vr1000-map.h with 97% similarity]
arch/arm/mach-s3c2410/mach-amlm5900.c
arch/arm/mach-s3c2410/mach-bast.c
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2410/mach-n30.c
arch/arm/mach-s3c2410/mach-otom.c
arch/arm/mach-s3c2410/mach-qt2410.c
arch/arm/mach-s3c2410/mach-smdk2410.c
arch/arm/mach-s3c2410/mach-tct_hammer.c
arch/arm/mach-s3c2410/mach-vr1000.c
arch/arm/mach-s3c2410/nor-simtec.c
arch/arm/mach-s3c2410/pm-h1940.S
arch/arm/mach-s3c2410/pm.c
arch/arm/mach-s3c2410/s3c2410.c
arch/arm/mach-s3c2410/sleep.S
arch/arm/mach-s3c2410/usb-simtec.c
arch/arm/mach-s3c2412/clock.c
arch/arm/mach-s3c2412/dma.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s3c2412/irq.c
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2412/mach-smdk2413.c
arch/arm/mach-s3c2412/mach-vstms.c
arch/arm/mach-s3c2412/pm.c
arch/arm/mach-s3c2412/s3c2412.c
arch/arm/mach-s3c2412/sleep.S
arch/arm/mach-s3c2440/clock.c
arch/arm/mach-s3c2440/dma.c
arch/arm/mach-s3c2440/dsc.c
arch/arm/mach-s3c2440/irq.c
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-at2440evb.c
arch/arm/mach-s3c2440/mach-nexcoder.c
arch/arm/mach-s3c2440/mach-osiris.c
arch/arm/mach-s3c2440/mach-rx3715.c
arch/arm/mach-s3c2440/mach-smdk2440.c
arch/arm/mach-s3c2440/s3c2440.c
arch/arm/mach-s3c2442/clock.c
arch/arm/mach-s3c2443/clock.c
arch/arm/mach-s3c2443/dma.c
arch/arm/mach-s3c2443/irq.c
arch/arm/mach-s3c2443/mach-smdk2443.c
arch/arm/mach-s3c2443/s3c2443.c
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/badge4.c
arch/arm/mach-sa1100/cerf.c
arch/arm/mach-sa1100/clock.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/collie_pm.c
arch/arm/mach-sa1100/cpu-sa1100.c
arch/arm/mach-sa1100/cpu-sa1110.c
arch/arm/mach-sa1100/dma.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/gpio.c
arch/arm/mach-sa1100/h3600.c
arch/arm/mach-sa1100/hackkit.c
arch/arm/mach-sa1100/include/mach/SA-1100.h [moved from include/asm-arm/arch-sa1100/SA-1100.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/SA-1101.h [moved from include/asm-arm/arch-sa1100/SA-1101.h with 99% similarity]
arch/arm/mach-sa1100/include/mach/SA-1111.h [moved from include/asm-arm/arch-sa1100/SA-1111.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/assabet.h [moved from include/asm-arm/arch-sa1100/assabet.h with 98% similarity]
arch/arm/mach-sa1100/include/mach/badge4.h [moved from include/asm-arm/arch-sa1100/badge4.h with 96% similarity]
arch/arm/mach-sa1100/include/mach/bitfield.h [moved from include/asm-arm/arch-sa1100/bitfield.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/cerf.h [moved from include/asm-arm/arch-sa1100/cerf.h with 94% similarity]
arch/arm/mach-sa1100/include/mach/collie.h [moved from include/asm-arm/arch-sa1100/collie.h with 98% similarity]
arch/arm/mach-sa1100/include/mach/debug-macro.S [moved from include/asm-arm/arch-sa1100/debug-macro.S with 90% similarity]
arch/arm/mach-sa1100/include/mach/dma.h [moved from include/asm-arm/arch-sa1100/dma.h with 98% similarity]
arch/arm/mach-sa1100/include/mach/entry-macro.S [moved from include/asm-arm/arch-sa1100/entry-macro.S with 95% similarity]
arch/arm/mach-sa1100/include/mach/gpio.h [moved from include/asm-arm/arch-sa1100/gpio.h with 95% similarity]
arch/arm/mach-sa1100/include/mach/h3600.h [moved from include/asm-arm/arch-sa1100/h3600.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/h3600_gpio.h [moved from include/asm-arm/arch-sa1100/h3600_gpio.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/hardware.h [moved from include/asm-arm/arch-sa1100/hardware.h with 96% similarity]
arch/arm/mach-sa1100/include/mach/ide.h [moved from include/asm-arm/arch-sa1100/ide.h with 95% similarity]
arch/arm/mach-sa1100/include/mach/io.h [moved from include/asm-arm/arch-sa1100/io.h with 92% similarity]
arch/arm/mach-sa1100/include/mach/irqs.h [moved from include/asm-arm/arch-sa1100/irqs.h with 99% similarity]
arch/arm/mach-sa1100/include/mach/jornada720.h [moved from include/asm-arm/arch-sa1100/jornada720.h with 93% similarity]
arch/arm/mach-sa1100/include/mach/lart.h [moved from include/asm-arm/arch-sa1100/lart.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/mcp.h [moved from include/asm-arm/arch-sa1100/mcp.h with 90% similarity]
arch/arm/mach-sa1100/include/mach/memory.h [moved from include/asm-arm/arch-sa1100/memory.h with 97% similarity]
arch/arm/mach-sa1100/include/mach/mtd-xip.h [moved from include/asm-arm/arch-sa1100/mtd-xip.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/neponset.h [moved from include/asm-arm/arch-sa1100/neponset.h with 98% similarity]
arch/arm/mach-sa1100/include/mach/shannon.h [moved from include/asm-arm/arch-sa1100/shannon.h with 100% similarity]
arch/arm/mach-sa1100/include/mach/simpad.h [moved from include/asm-arm/arch-sa1100/simpad.h with 98% similarity]
arch/arm/mach-sa1100/include/mach/system.h [moved from include/asm-arm/arch-sa1100/system.h with 79% similarity]
arch/arm/mach-sa1100/include/mach/timex.h [moved from include/asm-arm/arch-sa1100/timex.h with 75% similarity]
arch/arm/mach-sa1100/include/mach/uncompress.h [moved from include/asm-arm/arch-sa1100/uncompress.h with 95% similarity]
arch/arm/mach-sa1100/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-sa1100/irq.c
arch/arm/mach-sa1100/jornada720.c
arch/arm/mach-sa1100/jornada720_ssp.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/leds-assabet.c
arch/arm/mach-sa1100/leds-badge4.c
arch/arm/mach-sa1100/leds-cerf.c
arch/arm/mach-sa1100/leds-hackkit.c
arch/arm/mach-sa1100/leds-lart.c
arch/arm/mach-sa1100/leds-simpad.c
arch/arm/mach-sa1100/neponset.c
arch/arm/mach-sa1100/pleb.c
arch/arm/mach-sa1100/pm.c
arch/arm/mach-sa1100/shannon.c
arch/arm/mach-sa1100/simpad.c
arch/arm/mach-sa1100/sleep.S
arch/arm/mach-sa1100/ssp.c
arch/arm/mach-sa1100/time.c
arch/arm/mach-shark/include/mach/debug-macro.S [moved from include/asm-arm/arch-shark/debug-macro.S with 92% similarity]
arch/arm/mach-shark/include/mach/dma.h [moved from include/asm-arm/arch-shark/dma.h with 88% similarity]
arch/arm/mach-shark/include/mach/entry-macro.S [moved from include/asm-arm/arch-shark/entry-macro.S with 95% similarity]
arch/arm/mach-shark/include/mach/hardware.h [moved from include/asm-arm/arch-shark/hardware.h with 89% similarity]
arch/arm/mach-shark/include/mach/io.h [moved from include/asm-arm/arch-shark/io.h with 91% similarity]
arch/arm/mach-shark/include/mach/irqs.h [moved from include/asm-arm/arch-shark/irqs.h with 81% similarity]
arch/arm/mach-shark/include/mach/memory.h [moved from include/asm-arm/arch-shark/memory.h with 90% similarity]
arch/arm/mach-shark/include/mach/system.h [moved from include/asm-arm/arch-shark/system.h with 89% similarity]
arch/arm/mach-shark/include/mach/timex.h [moved from include/asm-arm/arch-shark/timex.h with 60% similarity]
arch/arm/mach-shark/include/mach/uncompress.h [moved from include/asm-arm/arch-shark/uncompress.h with 85% similarity]
arch/arm/mach-shark/include/mach/vmalloc.h [moved from include/asm-arm/arch-shark/vmalloc.h with 56% similarity]
arch/arm/mach-shark/irq.c
arch/arm/mach-shark/leds.c
arch/arm/mach-versatile/core.c
arch/arm/mach-versatile/include/mach/debug-macro.S [moved from include/asm-arm/arch-versatile/debug-macro.S with 91% similarity]
arch/arm/mach-versatile/include/mach/dma.h [moved from include/asm-arm/arch-versatile/dma.h with 94% similarity]
arch/arm/mach-versatile/include/mach/entry-macro.S [moved from include/asm-arm/arch-versatile/entry-macro.S with 92% similarity]
arch/arm/mach-versatile/include/mach/hardware.h [moved from include/asm-arm/arch-versatile/hardware.h with 95% similarity]
arch/arm/mach-versatile/include/mach/io.h [moved from include/asm-arm/arch-versatile/io.h with 95% similarity]
arch/arm/mach-versatile/include/mach/irqs.h [moved from include/asm-arm/arch-versatile/irqs.h with 99% similarity]
arch/arm/mach-versatile/include/mach/memory.h [moved from include/asm-arm/arch-versatile/memory.h with 96% similarity]
arch/arm/mach-versatile/include/mach/platform.h [moved from include/asm-arm/arch-versatile/platform.h with 99% similarity]
arch/arm/mach-versatile/include/mach/system.h [moved from include/asm-arm/arch-versatile/system.h with 92% similarity]
arch/arm/mach-versatile/include/mach/timex.h [moved from include/asm-arm/arch-versatile/timex.h with 94% similarity]
arch/arm/mach-versatile/include/mach/uncompress.h [moved from include/asm-arm/arch-versatile/uncompress.h with 96% similarity]
arch/arm/mach-versatile/include/mach/vmalloc.h [moved from include/asm-arm/arch-versatile/vmalloc.h with 94% similarity]
arch/arm/mach-versatile/pci.c
arch/arm/mach-versatile/versatile_ab.c
arch/arm/mach-versatile/versatile_pb.c
arch/arm/mm/cache-v3.S
arch/arm/mm/cache-v4.S
arch/arm/mm/cache-v4wt.S
arch/arm/mm/proc-sa110.S
arch/arm/mm/proc-sa1100.S
arch/arm/mm/proc-xsc3.S
arch/arm/oprofile/op_model_mpcore.c
arch/arm/plat-iop/adma.c
arch/arm/plat-iop/i2c.c
arch/arm/plat-iop/io.c
arch/arm/plat-iop/pci.c
arch/arm/plat-iop/time.c
arch/arm/plat-mxc/clock.c
arch/arm/plat-mxc/gpio.c
arch/arm/plat-mxc/include/mach/board-mx27ads.h [moved from include/asm-arm/arch-mxc/board-mx27ads.h with 100% similarity]
arch/arm/plat-mxc/include/mach/board-mx31ads.h [moved from include/asm-arm/arch-mxc/board-mx31ads.h with 100% similarity]
arch/arm/plat-mxc/include/mach/board-mx31lite.h [moved from include/asm-arm/arch-mxc/board-mx31lite.h with 100% similarity]
arch/arm/plat-mxc/include/mach/board-pcm037.h [moved from include/asm-arm/arch-mxc/board-pcm037.h with 100% similarity]
arch/arm/plat-mxc/include/mach/board-pcm038.h [moved from include/asm-arm/arch-mxc/board-pcm038.h with 100% similarity]
arch/arm/plat-mxc/include/mach/clock.h [moved from include/asm-arm/arch-mxc/clock.h with 100% similarity]
arch/arm/plat-mxc/include/mach/common.h [moved from include/asm-arm/arch-mxc/common.h with 100% similarity]
arch/arm/plat-mxc/include/mach/debug-macro.S [moved from include/asm-arm/arch-mxc/debug-macro.S with 77% similarity]
arch/arm/plat-mxc/include/mach/dma.h [moved from include/asm-arm/arch-mxc/dma.h with 100% similarity]
arch/arm/plat-mxc/include/mach/entry-macro.S [moved from include/asm-arm/arch-mxc/entry-macro.S with 100% similarity]
arch/arm/plat-mxc/include/mach/gpio.h [moved from include/asm-arm/arch-mxc/gpio.h with 97% similarity]
arch/arm/plat-mxc/include/mach/hardware.h [moved from include/asm-arm/arch-mxc/hardware.h with 92% similarity]
arch/arm/plat-mxc/include/mach/iim.h [moved from include/asm-arm/arch-mxc/iim.h with 100% similarity]
arch/arm/plat-mxc/include/mach/imx-uart.h [moved from include/asm-arm/arch-mxc/imx-uart.h with 100% similarity]
arch/arm/plat-mxc/include/mach/io.h [moved from include/asm-arm/arch-mxc/io.h with 100% similarity]
arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h [moved from include/asm-arm/arch-mxc/iomux-mx1-mx2.h with 100% similarity]
arch/arm/plat-mxc/include/mach/iomux-mx3.h [moved from include/asm-arm/arch-mxc/iomux-mx3.h with 100% similarity]
arch/arm/plat-mxc/include/mach/irqs.h [moved from include/asm-arm/arch-mxc/irqs.h with 92% similarity]
arch/arm/plat-mxc/include/mach/memory.h [moved from include/asm-arm/arch-mxc/memory.h with 96% similarity]
arch/arm/plat-mxc/include/mach/mx27.h [moved from include/asm-arm/arch-mxc/mx27.h with 100% similarity]
arch/arm/plat-mxc/include/mach/mx31.h [moved from include/asm-arm/arch-mxc/mx31.h with 100% similarity]
arch/arm/plat-mxc/include/mach/mxc.h [moved from include/asm-arm/arch-mxc/mxc.h with 100% similarity]
arch/arm/plat-mxc/include/mach/mxc_timer.h [moved from include/asm-arm/arch-mxc/mxc_timer.h with 99% similarity]
arch/arm/plat-mxc/include/mach/system.h [moved from include/asm-arm/arch-mxc/system.h with 100% similarity]
arch/arm/plat-mxc/include/mach/timex.h [moved from include/asm-arm/arch-mxc/timex.h with 94% similarity]
arch/arm/plat-mxc/include/mach/uncompress.h [moved from include/asm-arm/arch-mxc/uncompress.h with 96% similarity]
arch/arm/plat-mxc/include/mach/vmalloc.h [moved from include/asm-arm/arch-mxc/vmalloc.h with 100% similarity]
arch/arm/plat-mxc/iomux-mx1-mx2.c
arch/arm/plat-mxc/irq.c
arch/arm/plat-mxc/time.c
arch/arm/plat-omap/clock.c
arch/arm/plat-omap/common.c
arch/arm/plat-omap/cpu-omap.c
arch/arm/plat-omap/debug-devices.c
arch/arm/plat-omap/debug-leds.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/fb.c
arch/arm/plat-omap/gpio.c
arch/arm/plat-omap/i2c.c
arch/arm/plat-omap/include/mach/aic23.h [moved from include/asm-arm/arch-omap/aic23.h with 98% similarity]
arch/arm/plat-omap/include/mach/blizzard.h [moved from include/asm-arm/arch-omap/blizzard.h with 100% similarity]
arch/arm/plat-omap/include/mach/board-2430sdp.h [moved from include/asm-arm/arch-omap/board-2430sdp.h with 96% similarity]
arch/arm/plat-omap/include/mach/board-ams-delta.h [moved from include/asm-arm/arch-omap/board-ams-delta.h with 98% similarity]
arch/arm/plat-omap/include/mach/board-apollon.h [moved from include/asm-arm/arch-omap/board-apollon.h with 96% similarity]
arch/arm/plat-omap/include/mach/board-fsample.h [moved from include/asm-arm/arch-omap/board-fsample.h with 94% similarity]
arch/arm/plat-omap/include/mach/board-h2.h [moved from include/asm-arm/arch-omap/board-h2.h with 97% similarity]
arch/arm/plat-omap/include/mach/board-h3.h [moved from include/asm-arm/arch-omap/board-h3.h with 97% similarity]
arch/arm/plat-omap/include/mach/board-h4.h [moved from include/asm-arm/arch-omap/board-h4.h with 96% similarity]
arch/arm/plat-omap/include/mach/board-innovator.h [moved from include/asm-arm/arch-omap/board-innovator.h with 97% similarity]
arch/arm/plat-omap/include/mach/board-nokia.h [moved from include/asm-arm/arch-omap/board-nokia.h with 94% similarity]
arch/arm/plat-omap/include/mach/board-osk.h [moved from include/asm-arm/arch-omap/board-osk.h with 97% similarity]
arch/arm/plat-omap/include/mach/board-palmte.h [moved from include/asm-arm/arch-omap/board-palmte.h with 94% similarity]
arch/arm/plat-omap/include/mach/board-palmtt.h [moved from include/asm-arm/arch-omap/board-palmtt.h with 92% similarity]
arch/arm/plat-omap/include/mach/board-palmz71.h [moved from include/asm-arm/arch-omap/board-palmz71.h with 93% similarity]
arch/arm/plat-omap/include/mach/board-perseus2.h [moved from include/asm-arm/arch-omap/board-perseus2.h with 95% similarity]
arch/arm/plat-omap/include/mach/board-sx1.h [moved from include/asm-arm/arch-omap/board-sx1.h with 100% similarity]
arch/arm/plat-omap/include/mach/board-voiceblue.h [moved from include/asm-arm/arch-omap/board-voiceblue.h with 100% similarity]
arch/arm/plat-omap/include/mach/board.h [moved from include/asm-arm/arch-omap/board.h with 95% similarity]
arch/arm/plat-omap/include/mach/clock.h [moved from include/asm-arm/arch-omap/clock.h with 99% similarity]
arch/arm/plat-omap/include/mach/common.h [moved from include/asm-arm/arch-omap/common.h with 98% similarity]
arch/arm/plat-omap/include/mach/control.h [moved from include/asm-arm/arch-omap/control.h with 99% similarity]
arch/arm/plat-omap/include/mach/cpu.h [moved from include/asm-arm/arch-omap/cpu.h with 99% similarity]
arch/arm/plat-omap/include/mach/debug-macro.S [moved from include/asm-arm/arch-omap/debug-macro.S with 96% similarity]
arch/arm/plat-omap/include/mach/dma.h [moved from include/asm-arm/arch-omap/dma.h with 99% similarity]
arch/arm/plat-omap/include/mach/dmtimer.h [moved from include/asm-arm/arch-omap/dmtimer.h with 98% similarity]
arch/arm/plat-omap/include/mach/dsp_common.h [moved from include/asm-arm/arch-omap/dsp_common.h with 100% similarity]
arch/arm/plat-omap/include/mach/eac.h [moved from include/asm-arm/arch-omap/eac.h with 96% similarity]
arch/arm/plat-omap/include/mach/entry-macro.S [moved from include/asm-arm/arch-omap/entry-macro.S with 92% similarity]
arch/arm/plat-omap/include/mach/fpga.h [moved from include/asm-arm/arch-omap/fpga.h with 99% similarity]
arch/arm/plat-omap/include/mach/gpio-switch.h [moved from include/asm-arm/arch-omap/gpio-switch.h with 100% similarity]
arch/arm/plat-omap/include/mach/gpio.h [moved from include/asm-arm/arch-omap/gpio.h with 98% similarity]
arch/arm/plat-omap/include/mach/gpioexpander.h [moved from include/asm-arm/arch-omap/gpioexpander.h with 94% similarity]
arch/arm/plat-omap/include/mach/gpmc.h [moved from include/asm-arm/arch-omap/gpmc.h with 100% similarity]
arch/arm/plat-omap/include/mach/hardware.h [moved from include/asm-arm/arch-omap/hardware.h with 99% similarity]
arch/arm/plat-omap/include/mach/hwa742.h [moved from include/asm-arm/arch-omap/hwa742.h with 100% similarity]
arch/arm/plat-omap/include/mach/io.h [moved from include/asm-arm/arch-omap/io.h with 98% similarity]
arch/arm/plat-omap/include/mach/irda.h [moved from include/asm-arm/arch-omap/irda.h with 95% similarity]
arch/arm/plat-omap/include/mach/irqs.h [moved from include/asm-arm/arch-omap/irqs.h with 99% similarity]
arch/arm/plat-omap/include/mach/keypad.h [moved from include/asm-arm/arch-omap/keypad.h with 95% similarity]
arch/arm/plat-omap/include/mach/lcd_mipid.h [moved from include/asm-arm/arch-omap/lcd_mipid.h with 100% similarity]
arch/arm/plat-omap/include/mach/led.h [moved from include/asm-arm/arch-omap/led.h with 92% similarity]
arch/arm/plat-omap/include/mach/mailbox.h [moved from include/asm-arm/arch-omap/mailbox.h with 100% similarity]
arch/arm/plat-omap/include/mach/mcbsp.h [moved from include/asm-arm/arch-omap/mcbsp.h with 99% similarity]
arch/arm/plat-omap/include/mach/mcspi.h [moved from include/asm-arm/arch-omap/mcspi.h with 100% similarity]
arch/arm/plat-omap/include/mach/memory.h [moved from include/asm-arm/arch-omap/memory.h with 96% similarity]
arch/arm/plat-omap/include/mach/menelaus.h [moved from include/asm-arm/arch-omap/menelaus.h with 96% similarity]
arch/arm/plat-omap/include/mach/mmc.h [moved from include/asm-arm/arch-omap/mmc.h with 98% similarity]
arch/arm/plat-omap/include/mach/mtd-xip.h [moved from include/asm-arm/arch-omap/mtd-xip.h with 98% similarity]
arch/arm/plat-omap/include/mach/mux.h [moved from include/asm-arm/arch-omap/mux.h with 99% similarity]
arch/arm/plat-omap/include/mach/nand.h [moved from include/asm-arm/arch-omap/nand.h with 93% similarity]
arch/arm/plat-omap/include/mach/omap-alsa.h [moved from include/asm-arm/arch-omap/omap-alsa.h with 97% similarity]
arch/arm/plat-omap/include/mach/omap1510.h [moved from include/asm-arm/arch-omap/omap1510.h with 97% similarity]
arch/arm/plat-omap/include/mach/omap16xx.h [moved from include/asm-arm/arch-omap/omap16xx.h with 99% similarity]
arch/arm/plat-omap/include/mach/omap24xx.h [moved from include/asm-arm/arch-omap/omap24xx.h with 98% similarity]
arch/arm/plat-omap/include/mach/omap34xx.h [moved from include/asm-arm/arch-omap/omap34xx.h with 98% similarity]
arch/arm/plat-omap/include/mach/omap730.h [moved from include/asm-arm/arch-omap/omap730.h with 98% similarity]
arch/arm/plat-omap/include/mach/omapfb.h [moved from include/asm-arm/arch-omap/omapfb.h with 99% similarity]
arch/arm/plat-omap/include/mach/onenand.h [moved from include/asm-arm/arch-omap/onenand.h with 91% similarity]
arch/arm/plat-omap/include/mach/param.h [moved from include/asm-arm/arch-omap/param.h with 66% similarity]
arch/arm/plat-omap/include/mach/pm.h [moved from include/asm-arm/arch-omap/pm.h with 99% similarity]
arch/arm/plat-omap/include/mach/prcm.h [moved from include/asm-arm/arch-omap/prcm.h with 95% similarity]
arch/arm/plat-omap/include/mach/sdrc.h [moved from include/asm-arm/arch-omap/sdrc.h with 99% similarity]
arch/arm/plat-omap/include/mach/serial.h [moved from include/asm-arm/arch-omap/serial.h with 95% similarity]
arch/arm/plat-omap/include/mach/sram.h [moved from include/asm-arm/arch-omap/sram.h with 97% similarity]
arch/arm/plat-omap/include/mach/system.h [moved from include/asm-arm/arch-omap/system.h with 90% similarity]
arch/arm/plat-omap/include/mach/tc.h [moved from include/asm-arm/arch-omap/tc.h with 98% similarity]
arch/arm/plat-omap/include/mach/timex.h [moved from include/asm-arm/arch-omap/timex.h with 97% similarity]
arch/arm/plat-omap/include/mach/uncompress.h [moved from include/asm-arm/arch-omap/uncompress.h with 92% similarity]
arch/arm/plat-omap/include/mach/usb.h [moved from include/asm-arm/arch-omap/usb.h with 99% similarity]
arch/arm/plat-omap/include/mach/vmalloc.h [moved from include/asm-arm/arch-omap/vmalloc.h with 94% similarity]
arch/arm/plat-omap/mailbox.c
arch/arm/plat-omap/mcbsp.c
arch/arm/plat-omap/mux.c
arch/arm/plat-omap/ocpi.c
arch/arm/plat-omap/sram.c
arch/arm/plat-omap/usb.c
arch/arm/plat-orion/time.c
arch/arm/plat-s3c24xx/clock.c
arch/arm/plat-s3c24xx/common-smdk.c
arch/arm/plat-s3c24xx/cpu.c
arch/arm/plat-s3c24xx/devs.c
arch/arm/plat-s3c24xx/dma.c
arch/arm/plat-s3c24xx/gpio.c
arch/arm/plat-s3c24xx/gpiolib.c
arch/arm/plat-s3c24xx/irq.c
arch/arm/plat-s3c24xx/pm-simtec.c
arch/arm/plat-s3c24xx/pm.c
arch/arm/plat-s3c24xx/pwm-clock.c
arch/arm/plat-s3c24xx/s3c244x-clock.c
arch/arm/plat-s3c24xx/s3c244x-irq.c
arch/arm/plat-s3c24xx/s3c244x.c
arch/arm/plat-s3c24xx/sleep.S
arch/arm/plat-s3c24xx/time.c
drivers/char/ds1620.c
drivers/char/hw_random/ixp4xx-rng.c
drivers/crypto/ixp4xx_crypto.c
drivers/dma/iop-adma.c
drivers/i2c/busses/i2c-acorn.c
drivers/i2c/busses/i2c-at91.c
drivers/i2c/busses/i2c-davinci.c
drivers/i2c/busses/i2c-ixp2000.c
drivers/i2c/busses/i2c-pnx.c
drivers/i2c/busses/i2c-pxa.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/i2c/chips/isp1301_omap.c
drivers/i2c/chips/menelaus.c
drivers/ide/arm/ide_arm.c
drivers/input/keyboard/aaed2000_kbd.c
drivers/input/keyboard/corgikbd.c
drivers/input/keyboard/jornada720_kbd.c
drivers/input/keyboard/omap-keypad.c
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/keyboard/spitzkbd.c
drivers/input/keyboard/tosakbd.c
drivers/input/misc/ixp4xx-beeper.c
drivers/input/mouse/rpcmouse.c
drivers/input/serio/rpckbd.c
drivers/input/touchscreen/corgi_ts.c
drivers/input/touchscreen/h3600_ts_input.c
drivers/input/touchscreen/jornada720_ts.c
drivers/input/touchscreen/mainstone-wm97xx.c
drivers/leds/leds-ams-delta.c
drivers/leds/leds-cm-x270.c
drivers/leds/leds-corgi.c
drivers/leds/leds-fsg.c
drivers/leds/leds-h1940.c
drivers/leds/leds-locomo.c
drivers/leds/leds-s3c24xx.c
drivers/leds/leds-spitz.c
drivers/media/video/pxa_camera.c
drivers/mfd/mcp-sa11x0.c
drivers/mfd/ucb1x00-core.c
drivers/mfd/ucb1x00-ts.c
drivers/mmc/host/at91_mci.c
drivers/mmc/host/imxmmc.c
drivers/mmc/host/omap.c
drivers/mmc/host/pxamci.c
drivers/mmc/host/s3cmci.c
drivers/mtd/maps/autcpu12-nvram.c
drivers/mtd/maps/cdb89712.c
drivers/mtd/maps/ceiva.c
drivers/mtd/maps/h720x-flash.c
drivers/mtd/maps/integrator-flash.c
drivers/mtd/maps/ipaq-flash.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/maps/omap_nor.c
drivers/mtd/maps/pxa2xx-flash.c
drivers/mtd/maps/sa1100-flash.c
drivers/mtd/nand/ams-delta.c
drivers/mtd/nand/atmel_nand.c
drivers/mtd/nand/autcpu12.c
drivers/mtd/nand/cmx270_nand.c
drivers/mtd/nand/edb7312.c
drivers/mtd/nand/h1910.c
drivers/mtd/nand/orion_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/sharpsl.c
drivers/mtd/nand/ts7250.c
drivers/net/arm/am79c961a.c
drivers/net/arm/at91_ether.c
drivers/net/arm/ep93xx_eth.c
drivers/net/arm/ixp4xx_eth.c
drivers/net/cs89x0.c
drivers/net/irda/ep7211-sir.c
drivers/net/irda/pxaficp_ir.c
drivers/net/irda/sa1100_ir.c
drivers/net/ixp2000/ixp2400-msf.c
drivers/net/macb.c
drivers/net/netx-eth.c
drivers/net/smc911x.h
drivers/net/smc91x.h
drivers/pcmcia/at91_cf.c
drivers/pcmcia/omap_cf.c
drivers/pcmcia/pxa2xx_base.c
drivers/pcmcia/pxa2xx_cm_x270.c
drivers/pcmcia/pxa2xx_lubbock.c
drivers/pcmcia/pxa2xx_mainstone.c
drivers/pcmcia/pxa2xx_palmtx.c
drivers/pcmcia/pxa2xx_sharpsl.c
drivers/pcmcia/sa1100_assabet.c
drivers/pcmcia/sa1100_badge4.c
drivers/pcmcia/sa1100_cerf.c
drivers/pcmcia/sa1100_h3600.c
drivers/pcmcia/sa1100_jornada720.c
drivers/pcmcia/sa1100_neponset.c
drivers/pcmcia/sa1100_shannon.c
drivers/pcmcia/sa1100_simpad.c
drivers/pcmcia/sa1111_generic.c
drivers/pcmcia/sa11xx_base.c
drivers/pcmcia/soc_common.c
drivers/power/palmtx_battery.c
drivers/power/tosa_battery.c
drivers/rtc/rtc-at91rm9200.c
drivers/rtc/rtc-at91sam9.c
drivers/rtc/rtc-ep93xx.c
drivers/rtc/rtc-s3c.c
drivers/rtc/rtc-sa1100.c
drivers/scsi/arm/acornscsi-io.S
drivers/serial/21285.c
drivers/serial/atmel_serial.c
drivers/serial/clps711x.c
drivers/serial/imx.c
drivers/serial/netx-serial.c
drivers/serial/pxa.c
drivers/serial/s3c2400.c
drivers/serial/s3c2410.c
drivers/serial/s3c2412.c
drivers/serial/s3c2440.c
drivers/serial/sa1100.c
drivers/serial/samsung.c
drivers/serial/serial_ks8695.c
drivers/spi/atmel_spi.c
drivers/spi/omap2_mcspi.c
drivers/spi/omap_uwire.c
drivers/spi/pxa2xx_spi.c
drivers/spi/spi_imx.c
drivers/spi/spi_s3c24xx.c
drivers/spi/spi_s3c24xx_gpio.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/atmel_usba_udc.c
drivers/usb/gadget/lh7a40x_udc.h
drivers/usb/gadget/omap_udc.c
drivers/usb/gadget/pxa25x_udc.c
drivers/usb/gadget/pxa25x_udc.h
drivers/usb/gadget/pxa27x_udc.c
drivers/usb/gadget/s3c2410_udc.c
drivers/usb/host/ohci-at91.c
drivers/usb/host/ohci-ep93xx.c
drivers/usb/host/ohci-lh7a404.c
drivers/usb/host/ohci-omap.c
drivers/usb/host/ohci-pnx4008.c
drivers/usb/host/ohci-pxa27x.c
drivers/usb/host/ohci-s3c2410.c
drivers/usb/host/ohci-sa1111.c
drivers/video/acornfb.c
drivers/video/am200epd.c
drivers/video/atmel_lcdfb.c
drivers/video/backlight/omap1_bl.c
drivers/video/clps711xfb.c
drivers/video/cyber2000fb.c
drivers/video/epson1355fb.c
drivers/video/imxfb.c
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/hwa742.c
drivers/video/omap/lcd_h3.c
drivers/video/omap/lcd_h4.c
drivers/video/omap/lcd_inn1510.c
drivers/video/omap/lcd_inn1610.c
drivers/video/omap/lcd_osk.c
drivers/video/omap/lcd_palmte.c
drivers/video/omap/lcd_palmtt.c
drivers/video/omap/lcd_palmz71.c
drivers/video/omap/lcd_sx1.c
drivers/video/omap/lcdc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/omap/sossi.c
drivers/video/pnx4008/dum.h
drivers/video/pnx4008/sdum.c
drivers/video/pxafb.c
drivers/video/s3c2410fb.c
drivers/video/sa1100fb.c
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/iop_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/s3c2410_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
include/asm-arm/arch-ep93xx/dma.h [deleted file]
include/asm-arm/arch-ep93xx/gesbc9312.h [deleted file]
include/asm-arm/arch-ep93xx/timex.h [deleted file]
include/asm-arm/arch-ep93xx/vmalloc.h [deleted file]
include/asm-arm/arch-iop32x/vmalloc.h [deleted file]
include/asm-arm/arch-iop33x/vmalloc.h [deleted file]
include/asm-arm/arch-ixp23xx/dma.h [deleted file]
include/asm-arm/arch-ixp23xx/time.h [deleted file]
include/asm-arm/arch-kirkwood/vmalloc.h [deleted file]
include/asm-arm/arch-loki/vmalloc.h [deleted file]
include/asm-arm/arch-mv78xx0/vmalloc.h [deleted file]
include/asm-arm/arch-orion5x/vmalloc.h [deleted file]
include/asm-arm/arch-sa1100/vmalloc.h [deleted file]
include/asm-arm/plat-s3c/iic.h
include/asm-arm/plat-s3c/nand.h
include/asm-arm/plat-s3c/regs-ac97.h
include/asm-arm/plat-s3c/regs-adc.h
include/asm-arm/plat-s3c/regs-iic.h
include/asm-arm/plat-s3c/regs-nand.h
include/asm-arm/plat-s3c/regs-rtc.h
include/asm-arm/plat-s3c/regs-serial.h
include/asm-arm/plat-s3c/regs-timer.h
include/asm-arm/plat-s3c/regs-watchdog.h
include/asm-arm/plat-s3c24xx/regs-iis.h
include/asm-arm/plat-s3c24xx/regs-spi.h
include/asm-arm/plat-s3c24xx/regs-udc.h
include/asm-arm/plat-s3c24xx/udc.h
sound/arm/pxa2xx-ac97.c
sound/arm/pxa2xx-pcm.c
sound/arm/sa11xx-uda1341.c
sound/oss/vidc.c
sound/oss/vidc_fill.S
sound/oss/waveartist.c
sound/soc/at32/playpaq_wm8510.c
sound/soc/at91/at91-pcm.c
sound/soc/at91/at91-pcm.h
sound/soc/at91/at91-ssc.c
sound/soc/at91/eti_b1_wm8731.c
sound/soc/davinci/davinci-evm.c
sound/soc/omap/n810.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/pxa/corgi.c
sound/soc/pxa/e800_wm9712.c
sound/soc/pxa/em-x270.c
sound/soc/pxa/poodle.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
sound/soc/pxa/pxa2xx-pcm.c
sound/soc/pxa/spitz.c
sound/soc/pxa/tosa.c
sound/soc/s3c24xx/neo1973_wm8753.c
sound/soc/s3c24xx/s3c2412-i2s.c
sound/soc/s3c24xx/s3c2443-ac97.c
sound/soc/s3c24xx/s3c24xx-i2s.c
sound/soc/s3c24xx/s3c24xx-pcm.c

index 43edb4ecf27dbdd7138ea3c969f4c45cbcd720c7..72fbcc4fcab095fd61a886d3d542692a6f94d21e 100644 (file)
@@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips:
 - Flash access (MTD/JFFS)
 - I2C through GPIO on IXP42x
 - GPIO for input/output/interrupts 
-  See include/asm-arm/arch-ixp4xx/platform.h for access functions.
+  See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.
 - Timers (watchdog, OS)
 
 The following components of the chips are not supported by Linux and
index c202ed35d7d610dd3c399b50fdb65796917f1544..f09ab1b90ef1b486bb55273a53590b22fb8193fa 100644 (file)
@@ -158,7 +158,7 @@ So, what's changed?
    be re-checked for pending events.  (see the Neponset IRQ handler for
    details).
 
-7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h
+7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h
 
 Please note that this will not solve all problems - some of them are
 hardware based.  Mixing level-based and edge-based IRQs on the same
index 9b9c8226fdc428665fb2e792ce142b77abf2d80d..d98783fbe0c7c8b6ff95a6e61931fc56d4ef7a3b 100644 (file)
@@ -79,7 +79,7 @@ Machine/Platform support
   To this end, we now have arch/arm/mach-$(MACHINE) directories which are
   designed to house the non-driver files for a particular machine (eg, PCI,
   memory management, architecture definitions etc).  For all future
-  machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)
+  machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach
   directory.
 
 
@@ -176,7 +176,7 @@ Kernel entry (head.S)
   class typically based around one or more system on a chip devices, and
   acts as a natural container around the actual implementations.  These
   classes are given directories - arch/arm/mach-<class> and
-  include/asm-arm/arch-<class> - which contain the source files to
+  arch/arm/mach-<class> - which contain the source files to/include/mach
   support the machine class.  This directories also contain any machine
   specific supporting code.
 
index 8caea8c237eec0b9a033414c53ab2ea30b313800..b5d20c0b2ab46d60472797dad8dcf197971d9199 100644 (file)
@@ -16,13 +16,13 @@ Introduction
 Headers
 -------
 
-  See include/asm-arm/arch-s3c2410/regs-gpio.h for the list
+  See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list
   of GPIO pins, and the configuration values for them. This
-  is included by using #include <asm/arch/regs-gpio.h>
+  is included by using #include <mach/regs-gpio.h>
 
   The GPIO management functions are defined in the hardware
-  header include/asm-arm/arch-s3c2410/hardware.h which can be
-  included by #include <asm/arch/hardware.h>
+  header arch/arm/mach-s3c2410/include/mach/hardware.h which can be
+  included by #include <mach/hardware.h>
 
   A useful amount of documentation can be found in the hardware
   header on how the GPIO functions (and others) work.
index d04e1e30c47f8ff1a8613a369506e58cf5a41a21..014a8ec4877d296be7864abd82e663fb93e8c8f0 100644 (file)
@@ -36,7 +36,7 @@ Layout
   in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440
 
   Register, kernel and platform data definitions are held in the
-  include/asm-arm/arch-s3c2410 directory.
+  arch/arm/mach-s3c2410 directory./include/mach
 
 
 Machines
index b93b68e2b143ec72bed475f6a4203dc3fc485c70..67671eba423125179a6ab7f0e831225dab43bbbb 100644 (file)
@@ -49,7 +49,7 @@ Board Support
 Platform Data
 -------------
 
-  See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
+  See arch/arm/mach-s3c2410/include/mach/usb-control.h for the
   descriptions of the platform device data. An implementation
   can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .
 
index f3853cc37bde387e4608c27833e4653aa3811d3b..bbe8dee681a5d2b9a503d7f59b22e79d7a3e9014 100644 (file)
@@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers
 -----------------------------------
 Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a
 "platform device".  The master configuration is passed to the driver via a table
-found in include/asm-arm/arch-pxa/pxa2xx_spi.h:
+found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h:
 
 struct pxa2xx_spi_master {
        enum pxa_ssp_type ssp_type;
@@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See
 
 Each slave device attached to the PXA must provide slave specific configuration
 information via the structure "pxa2xx_spi_chip" found in
-"include/asm-arm/arch-pxa/pxa2xx_spi.h".  The pxa2xx_spi master controller driver
+"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h".  The pxa2xx_spi master controller driver
 will uses the configuration whenever the driver communicates with the slave
 device.
 
index 6d5f18143c5038b30a8e522f078fd74362855b02..8bae2f018d342cf6f027ec5a2dc3ace9ad709bb8 100644 (file)
@@ -210,7 +210,7 @@ board should normally be set up and registered.
 
 So for example arch/.../mach-*/board-*.c files might have code like:
 
-       #include <asm/arch/spi.h>       /* for mysoc_spi_data */
+       #include <mach/spi.h>   /* for mysoc_spi_data */
 
        /* if your mach-* infrastructure doesn't support kernels that can
         * run on multiple boards, pdata wouldn't benefit from "__init".
@@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:
 
 And SOC-specific utility code might look something like:
 
-       #include <asm/arch/spi.h>
+       #include <mach/spi.h>
 
        static struct platform_device spi2 = { ... };
 
index 359d224c8c3ea213caa21c448f8bcf09328c8011..703a44fa0f9b7c70814c17ab21e613eafcf4655a 100644 (file)
@@ -97,9 +97,7 @@ textofs-y     := 0x00008000
  machine-$(CONFIG_ARCH_RPC)       := rpc
  machine-$(CONFIG_ARCH_EBSA110)           := ebsa110
  machine-$(CONFIG_ARCH_CLPS7500)   := clps7500
-  incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500
  machine-$(CONFIG_FOOTBRIDGE)     := footbridge
-  incdir-$(CONFIG_FOOTBRIDGE)     := ebsa285
  machine-$(CONFIG_ARCH_SHARK)     := shark
  machine-$(CONFIG_ARCH_SA1100)    := sa1100
 ifeq ($(CONFIG_ARCH_SA1100),y)
@@ -120,7 +118,6 @@ endif
  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
  machine-$(CONFIG_ARCH_OMAP1)     := omap1
  machine-$(CONFIG_ARCH_OMAP2)     := omap2
-  incdir-$(CONFIG_ARCH_OMAP)      := omap
     plat-$(CONFIG_ARCH_OMAP)      := omap
  machine-$(CONFIG_ARCH_S3C2410)           := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
     plat-$(CONFIG_PLAT_S3C24XX)           := s3c24xx
@@ -138,7 +135,6 @@ endif
  machine-$(CONFIG_ARCH_DAVINCI)           := davinci
  machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood
  machine-$(CONFIG_ARCH_KS8695)     := ks8695
-  incdir-$(CONFIG_ARCH_MXC)       := mxc
     plat-$(CONFIG_ARCH_MXC)       := mxc
  machine-$(CONFIG_ARCH_MX2)       := mx2
  machine-$(CONFIG_ARCH_MX3)       := mx3
@@ -158,11 +154,6 @@ endif
 # The byte offset of the kernel image in RAM from the start of RAM.
 TEXT_OFFSET := $(textofs-y)
 
-ifeq ($(incdir-y),)
-incdir-y := $(word 1,$(machine-y))
-endif
-INCDIR   := arch-$(incdir-y)
-
 # The first directory contains additional information for the boot setup code
 ifneq ($(machine-y),)
 MACHINE  := arch/arm/mach-$(word 1,$(machine-y))/
@@ -213,20 +204,10 @@ boot := arch/arm/boot
 #      them changed.  We use .arch to indicate when they were updated
 #      last, otherwise make uses the target directory mtime.
 
-include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-       @echo '  SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p include/asm-arm
-       $(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
-else
-       $(Q)ln -fsn $(INCDIR) include/asm-arm/arch
-endif
-       @touch $@
-
 archprepare: maketools
 
 PHONY += maketools FORCE
-maketools: include/linux/version.h include/asm-arm/.arch FORCE
+maketools: include/linux/version.h FORCE
        $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
 
 # Convert bzImage to zImage
index de41daeab5e9832416218a0ca3e07b9a15cb219f..d42f89b7760bf2c537d3f4769bbc53715af7b6b5 100644 (file)
@@ -37,7 +37,7 @@
 
 #else
 
-#include <asm/arch/debug-macro.S>
+#include <mach/debug-macro.S>
 
                .macro  writeb, ch, rb
                senduart \ch, \rb
index 7145cc7c04f0b8e36fb4b86205602fa7e0618bac..65ce8fff29db1583890fe54f438f6f03385e11a9 100644 (file)
@@ -27,7 +27,7 @@ unsigned int __machine_arch_type;
 static void putstr(const char *ptr);
 
 #include <linux/compiler.h>
-#include <asm/arch/uncompress.h>
+#include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC
 
index 1f0f0adeafb3b5b8674e83ca015b98fafcdeb541..283051eaf931c7b1f02b58690ec7239d25eed9d7 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
index 64c328d1627f66c92a2e6161051b92e721330350..ec8a5471bf06df84b2c54441619724631fc54b4c 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/irq.h>
index a0d1540068898a197e8422c723777f1487a3f358..db83091614082efb5aac4a6dc6630d5d2e99353f 100644 (file)
 #include <linux/apm-emulation.h>
 #include <linux/suspend.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/sharpsl.h>
+#include <mach/pm.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/sharpsl.h>
 #include <asm/hardware/sharpsl_pm.h>
 
 /*
index af37bfd74f9cd74e792e7633cf3e14d50d1aaa92..df0983aafe694b6e58cab75da60e2eeff5ddb673 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/hardware/ioc.h>
 
index 3e19985ddecb7eae2fa6009156198210ab5aa05f..7ecd3c0ab011a2c1196c9c61bdd0c34296c4b659 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/uengine.h>
 #include <asm/io.h>
 
index 9f2c5305c26014a9aea95faaf73a9c82c1260201..75154b1931173adc897597c228e21972594583d8 100644 (file)
@@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
 #include <linux/spinlock.h>
 #include <asm/system.h>
 #include <asm/scatterlist.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 /*
  * This is the maximum virtual address which can be DMA'd from.
index dce20c25ab10f87eb1c01426a79e4d08d078acb9..c9f03eccc9d86ce76c022d519b4ba66623aa3935 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef __ASM_ARM_FLOPPY_H
 #define __ASM_ARM_FLOPPY_H
 #if 0
-#include <asm/arch/floppy.h>
+#include <mach/floppy.h>
 #endif
 
 #define fd_outb(val,port)                      \
index fff4f800ee421d797f7fa9240e8a485a8bdb7a51..166a7a3e28400db64062715a53bdb2f31d4e9df4 100644 (file)
@@ -2,6 +2,6 @@
 #define _ARCH_ARM_GPIO_H
 
 /* not all ARM platforms necessarily support this API ... */
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #endif /* _ARCH_ARM_GPIO_H */
index cf2578ffd54daba3a8fc903e603162f021848f9d..0d7552751aafc7d7abfdf1798ace6cc53db9131e 100644 (file)
@@ -19,7 +19,7 @@
 #define DC21285_PCI_MEM                        0x80000000
 
 #ifndef __ASSEMBLY__
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #define DC21285_IO(x)          ((volatile unsigned long *)(ARMCSR_BASE+(x)))
 #else
 #define DC21285_IO(x)          (x)
index df31b15cf6e034626fb70f9f23e3751766b42174..87bff09633aac50bdcffcdc0aae2891000cda161 100644 (file)
@@ -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>
 
 /* Memory copy units */
index 0ebc91cb42f9b7f61c1dddf8024eff581fa62f70..b69d972b1f7d21987c2ca86c7119cb101767f75d 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
 #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm-generic/gpio.h>
 
 #define IOP3XX_N_GPIOS 8
index 6cf98d4f7dc3ee6bd913419c8f06f083891191b0..5da2595759e52c925873dbfe8fc2615f5a09e306 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _ASM_ARCH_SA1111
 #define _ASM_ARCH_SA1111
 
-#include <asm/arch/bitfield.h>
+#include <mach/bitfield.h>
 
 /*
  * The SA1111 is always located at virtual 0xf4000000, and is always
index ffe07c0f46d8d4019d5f48054d99e94827a7fdee..94a95d7fafd6cdaf887e26dcfad35dbe6590c39a 100644 (file)
@@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn);
 /*
  * Now, pick up the machine-defined IO definitions
  */
-#include <asm/arch/io.h>
+#include <mach/io.h>
 
 /*
  *  IO port access primitives
index 9cb01907e43bc1eb0ea2c4fce870f853ac221fd2..d6786090d02caf5e4d7f0ab8b2c59121d86d46b7 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ASM_ARM_IRQ_H
 #define __ASM_ARM_IRQ_H
 
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #ifndef irq_canonicalize
 #define irq_canonicalize(i)    (i)
index 7b81e0c4254398b123742fc380625d164da85053..e1ca48a9e973442aaeff9333990a457c155be394 100644 (file)
@@ -4,7 +4,7 @@
 #ifndef _ASM_MC146818RTC_H
 #define _ASM_MC146818RTC_H
 
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 
 #ifndef RTC_PORT
index 92069221dca9ba5f59b34b1ad2c06a72c77e6286..1e070a2b561aa3390a02abf4ce0263b06a9055f0 100644 (file)
@@ -24,7 +24,7 @@
 #endif
 
 #include <linux/compiler.h>
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 #include <asm/sizes.h>
 
 #ifdef CONFIG_MMU
index f2fbb508490160a212be0a1252e5deffeb64aceb..ae63a4fd28c83c8c7786b32550220cf6ad9f83f1 100644 (file)
@@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];
  */
 #define NODE_MEM_MAP(nid)      (NODE_DATA(nid)->node_mem_map)
 
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 
 #endif
index 4bc50f9abe38d2c9ef2ebc9a7d522e6f8467b5f3..4225372a26f30e594bebfb98c307a06f28ff83a4 100644 (file)
@@ -17,8 +17,8 @@
 #ifndef __ARM_MTD_XIP_H__
 #define __ARM_MTD_XIP_H__
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/mtd-xip.h>
+#include <mach/hardware.h>
+#include <mach/mtd-xip.h>
 
 /* fill instruction prefetch */
 #define xip_iprefetch()        do { asm volatile (".rep 8; nop; .endr"); } while (0)
index 968b833f3bb775c14ec55bdb443a962ca8b59d49..721c03d53f4b34ce07ae7e8c23f69942ac1e5c4f 100644 (file)
@@ -4,7 +4,7 @@
 #ifdef __KERNEL__
 #include <asm-generic/pci-dma-compat.h>
 
-#include <asm/arch/hardware.h> /* for PCIBIOS_MIN_* */
+#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
 
 #define pcibios_scan_all_fns(a, b)     0
 
index 8ab060a53ab0a9cb4913de95048e4a1b6fd79028..8e21ef15bd743b9fb3b019bd7c9cc559c3c2ab61 100644 (file)
@@ -20,7 +20,7 @@
 #else
 
 #include <asm/memory.h>
-#include <asm/arch/vmalloc.h>
+#include <mach/vmalloc.h>
 #include <asm/pgtable-hwdef.h>
 
 /*
index cc12a525a06a337e61d1448d23968111230e11d5..727b5c042e522c9053873501803946a95433838b 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/cpumask.h>
 #include <linux/thread_info.h>
 
-#include <asm/arch/smp.h>
+#include <mach/smp.h>
 
 #ifndef CONFIG_SMP
 # error "<asm/smp.h> included in non-SMP build"
index e50e2926cd6ecce6ad0b038aa8ff2f56d25f937f..3be8de3adabae95908a9a6f640d3e9e42b0f7fb1 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _ASMARM_TIMEX_H
 #define _ASMARM_TIMEX_H
 
-#include <asm/arch/timex.h>
+#include <mach/timex.h>
 
 typedef unsigned long cycles_t;
 
index 4f767ad3a0bbcd488d5750d8a82042fa79e9e839..6a3cd2a2f6700d386a5cc82921eb9e6b6f76258e 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef ASMARM_VGA_H
 #define ASMARM_VGA_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #define VGA_MAP_MEM(x,s)       (PCIMEM_BASE + (x))
index a26886758c6737590e674c22b61515e7df9814e0..0ec9bb48fab9cd9b4ea20ab32ac9694d8d0d9881 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
-#include <asm/arch/ep93xx-regs.h>
+#include <mach/ep93xx-regs.h>
 
 /*
  * We can't use hex constants here due to a bug in gas.
index 627d79414c9d68212382eaefe64af6f896035509..3b6a1c293ee49cb03825a860a5edc0866133cf17 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <asm/arch/ep93xx-regs.h>
+#include <mach/ep93xx-regs.h>
 #include <asm/thread_notify.h>
 #include <asm/io.h>
 
index 5617566477b493d5cc6034a8518b8f6e696195f3..9550ff0ddde4f57393a3ccf1350c032e5115db2b 100644 (file)
@@ -80,7 +80,7 @@
 #endif /* CONFIG_CPU_V6 */
 
 #else
-#include <asm/arch/debug-macro.S>
+#include <mach/debug-macro.S>
 #endif /* CONFIG_DEBUG_ICEDCC */
 
 /*
index 8192fe8409d3d1238f2d3d12d6848b69e56c9b88..7a50575a8d4dbfe153c6d786ed5c3ba6138fa1f8 100644 (file)
@@ -46,7 +46,7 @@
 
 #include <asm/dma.h>
 #include <asm/ecard.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mmu_context.h>
 #include <asm/mach/irq.h>
index 7dca225752c1c49e1e77c9014bf831e3045b1ffa..617e509d60dfd1bdc148467d473e3c8596b2bb89 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/memory.h>
 #include <asm/glue.h>
 #include <asm/vfpmacros.h>
-#include <asm/arch/entry-macro.S>
+#include <mach/entry-macro.S>
 #include <asm/thread_notify.h>
 
 #include "entry-header.S"
index 84694e88b4289d07d2b952f69a1ff644ca010fb2..060d7e2e9f6408c1aaf647af4eba7b5858a8aa31 100644 (file)
@@ -10,7 +10,7 @@
 
 #include <asm/unistd.h>
 #include <asm/ftrace.h>
-#include <asm/arch/entry-macro.S>
+#include <mach/entry-macro.S>
 
 #include "entry-header.S"
 
index 89bfded70a1f480ced698568a9d5fd685c48a17b..3fd88233706413d09198bb6a69780415a9b5eb5e 100644 (file)
@@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode);
 
 static volatile int hlt_counter;
 
-#include <asm/arch/system.h>
+#include <mach/system.h>
 
 void disable_hlt(void)
 {
index 79cf247ad525d956a3b517fc307c71bd4d026551..8678eb2b7a60a21feaf0a74a919cf3a536dc3fd0 100644 (file)
@@ -12,7 +12,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define CPSR2SPSR(rt) \
                mrs     rt, cpsr; \
index 4cc4411595f5fa8dc4c992e8796bc9545f03abcd..9aaf7c72065d852a9fa049479d8f333430c0fe26 100644 (file)
@@ -9,7 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 .Linsw_bad_alignment:
                adr     r0, .Linsw_bad_align_msg
index 0a34752bc448b19cd87cf89f5f78ac5e910d4a3f..cd34503e424d6ef41aa1664be9857619d7563bf8 100644 (file)
@@ -9,7 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 .Loutsw_bad_alignment:
                adr     r0, .Loutsw_bad_align_msg
index 08f030d506b82403169392159388769dd319c9d4..81a3ecc0d104d0eddc0eb74a7609c42b082aff75 100644 (file)
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/aaed2000.h>
+#include <mach/aaed2000.h>
 
 #include "core.h"
 
index 2e0cec2dc9970760729d8ac68329ff162eef68ca..dfb26bc23d1a8838d8a8fd8a5a5bd37079f45051 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/timex.h>
 #include <linux/signal.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
similarity index 99%
rename from include/asm-arm/arch-aaec2000/aaec2000.h
rename to arch/arm/mach-aaec2000/include/mach/aaec2000.h
index a6d1ee0980f21d3372a552952f79c4aaef96c0da..bc729c42f8437dfae4f1e9aac9db2eb1d336d414 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-aaec2000/aaec2000.h
+ *  arch/arm/mach-aaec2000/include/mach/aaec2000.h
  *
  *  AAEC-2000 registers definition
  *
similarity index 96%
rename from include/asm-arm/arch-aaec2000/aaed2000.h
rename to arch/arm/mach-aaec2000/include/mach/aaed2000.h
index bc76d2badb91f733301138f4006c7c3e56da1ee6..f821295ca71bb819a05e565598f10cb34229430b 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-aaec2000/debug-macro.S
rename to arch/arm/mach-aaec2000/include/mach/debug-macro.S
index 7b1fce021d8a6c497c1817cb21750cf563c8d6f7..0b6351d7c38973e7431c601e291afab173d54551 100644 (file)
@@ -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
  *
similarity index 84%
rename from include/asm-arm/arch-aaec2000/dma.h
rename to arch/arm/mach-aaec2000/include/mach/dma.h
index e100b1e526fe972e0a8fa9f9721bf2bc5d685d2a..2da846c72fe736b0550d815815380c13fb861661 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-aaec2000/entry-macro.S
rename to arch/arm/mach-aaec2000/include/mach/entry-macro.S
index 83fdf68f6b7c9c216a1d6bbfe6152089fa414785..c8fb34469007952ac377eb7a7c0114e38b8b90b9 100644 (file)
@@ -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
similarity index 93%
rename from include/asm-arm/arch-aaec2000/hardware.h
rename to arch/arm/mach-aaec2000/include/mach/hardware.h
index 153506fd06ed0a78caa630383952f6817d54d153..965a6f6672d64c9f609be04a767d4fc8920ef718 100644 (file)
@@ -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
similarity index 82%
rename from include/asm-arm/arch-aaec2000/io.h
rename to arch/arm/mach-aaec2000/include/mach/io.h
index bc2364ab87521e18e4827908a7a584bf4e770d19..c87c24de1110b1f1d33bf46234699fcba23aa14b 100644 (file)
@@ -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
 
similarity index 97%
rename from include/asm-arm/arch-aaec2000/irqs.h
rename to arch/arm/mach-aaec2000/include/mach/irqs.h
index de252220e806e8743688109929f707b1211a4473..bf45c6d2f294fa1436699aa2b246d426022b4746 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-aaec2000/memory.h
rename to arch/arm/mach-aaec2000/include/mach/memory.h
index 9eceb4148922e7e1a9bff39f1ca263ae73b2c134..56ae900a482e28d1bd697bd030f316fc809c2a0a 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-aaec2000/system.h
rename to arch/arm/mach-aaec2000/include/mach/system.h
index 08de97b407a8372c0eb9911f21d02d6b8bd065a9..8f4115d734ce18832d005a31086694d643def027 100644 (file)
@@ -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
  *
similarity index 89%
rename from include/asm-arm/arch-aaec2000/timex.h
rename to arch/arm/mach-aaec2000/include/mach/timex.h
index f5708b38fb7f2f768d3319582feca7f8c11bc654..6c8edf4a8828a35b3ed838fd44e3786a1511f918 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-aaec2000/uncompress.h
rename to arch/arm/mach-aaec2000/include/mach/uncompress.h
index 300f4bf3bc74c0d973e48125a92d3adadc7d9694..381ecad1a1bba78d424d375e831ed562b8c28907 100644 (file)
@@ -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
  *
similarity index 88%
rename from include/asm-arm/arch-aaec2000/vmalloc.h
rename to arch/arm/mach-aaec2000/include/mach/vmalloc.h
index ecb991e2e4fffe88694d6ff19fb7d8a8b97de01d..551f68f666bf0273bb465272887cedfbe7244b94 100644 (file)
@@ -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
  *
index 933fa8f55cbc76fa60c6b52d714245dff2503125..638948c16770e50ce21cba285f0b7d65d6ca2fcd 100644 (file)
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/at91cap9.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/at91cap9.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 #include "clock.h"
index 25765f1afca9c443499b60a87e6546061f12f92e..abb4aac8fa983a6c90742d86cd12e460c36b8cf7 100644 (file)
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91cap9.h>
-#include <asm/arch/at91cap9_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91cap9.h>
+#include <mach/at91cap9_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index d688c1dbd92565ed2ef3b9e4c867183c868159f2..28594fcc88e3a4dfc482c234d8c00924238a3a4a 100644 (file)
@@ -14,9 +14,9 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/at91rm9200.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_st.h>
+#include <mach/at91rm9200.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_st.h>
 
 #include "generic.h"
 #include "clock.h"
index d2c5c84bf6b8ea2c43350bdfa796a9b6f20a4fb9..9338825cfcd7c1613337738ca4145e884a88a7ec 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91rm9200.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index 50392ff7151306b0fd3504285bd7157631dc6df3..a72e798a2a40eede144f22d85eb5204f0114ea18 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <asm/mach/time.h>
 
-#include <asm/arch/at91_st.h>
+#include <mach/at91_st.h>
 
 static unsigned long last_crtr;
 static u32 irqmask;
index 380f12a122004cc457a5ea7210aef908f97e783d..accb69ec478e53aca7bffb3e0aedefae89a167b5 100644 (file)
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91sam9260.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/cpu.h>
+#include <mach/at91sam9260.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 #include "clock.h"
index f5fec0a9cf49e53e215bb7ae24d9a527468d28b5..7774d17dde74352f425a085e9071ea5ff025b44d 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91sam9260.h>
-#include <asm/arch/at91sam9260_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/cpu.h>
+#include <mach/at91sam9260.h>
+#include <mach/at91sam9260_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 35bf6fd52516d8ba20dc8a363ea0c1bf2b67929b..7b51a59ae8b30f3b35dfcc2f7c22d37a15e6ed40 100644 (file)
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/at91sam9261.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/at91sam9261.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 #include "clock.h"
index b80860e313839c11b25af3c9c8bb3a41e215863a..6b89172310c7f566ddbbccb802aeb48315d02df9 100644 (file)
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9261.h>
-#include <asm/arch/at91sam9261_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9261.h>
+#include <mach/at91sam9261_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 052074a9f2d30334cada72af48903f64d5801292..80bfab5680e2a56ce0853398b7bed311b5b9e33b 100644 (file)
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/at91sam9263.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/at91sam9263.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 #include "clock.h"
index 42108d02f593c24c7832bbfcd3120b6da5f068b7..c93992f55dc906c6c2035aacf6b3e67b156c8670 100644 (file)
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9263.h>
-#include <asm/arch/at91sam9263_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9263.h>
+#include <mach/at91sam9263_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 5cecbd7de6a6d76b70d0cb14c0a7a210ff8932ca..122fd77ed580399b632451b114b66a9458c97239 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <asm/mach/time.h>
 
-#include <asm/arch/at91_pit.h>
+#include <mach/at91_pit.h>
 
 
 #define PIT_CPIV(x)    ((x) & AT91_PIT_CPIV)
index 902c79893ec7dfd1603230ddb25f548357929f22..556bddf35b45401facda3863284aae1998e483d3 100644 (file)
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91sam9rl.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/cpu.h>
+#include <mach/at91sam9rl.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 #include "clock.h"
index 9c61576f1c8dc281341b66eb5c8ed9eeb395e47c..620886341fb598f30dbe450ea43a72c4e0ab6f0e 100644 (file)
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9rl.h>
-#include <asm/arch/at91sam9rl_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9rl.h>
+#include <mach/at91sam9rl_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index f44647738ee46091c956a91ca31c2db276245591..ad3ec85b27906c5ac38c3d8f11432f0e87d61985 100644 (file)
@@ -14,9 +14,9 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/at91x40.h>
-#include <asm/arch/at91_st.h>
-#include <asm/arch/timex.h>
+#include <mach/at91x40.h>
+#include <mach/at91_st.h>
+#include <mach/timex.h>
 #include "generic.h"
 
 /*
index 44690440e8464158584fc944d1227471f03ddd5a..869b5e28d1959395332f139874d5ab7cb97b2062 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/time.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/time.h>
-#include <asm/arch/at91_tc.h>
+#include <mach/at91_tc.h>
 
 /*
  *     3 counter/timer units present.
index fc0f293174cb09ae144e38336107dac1334cab41..9b27d167bff0c0e850f21bebf2994aaf4c84554d 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -33,8 +33,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 17faf3cea12f8bbf25806d4693c2aa0e8cb09978..cdddca54b938ce79fd7ec2b182a96b22df0d3ff1 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -37,8 +37,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index fd21d4240e8e726d1297a49a9f630806e398124a..196199552eb6dbe18d079840994decf522fa37a5 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91cap9_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91cap9_matrix.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 5156fd2883c53490ee3040415c3bdd32c436c51d..afa1ff0e9577813967ff03706a00c65aa66e0234 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -34,8 +34,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index a55e9ca80efdd03cf1ec54035a10348f95fe02fd..cb7c9a8fa487e09c123203743ade3d9441afea8a 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -37,8 +37,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index dfdd4dda04a80d89bf0e524cdf255a0cd0bc2b01..8db8bd8babd96fd31de8d46d7e8eb8e5b8dd6d68 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -34,8 +34,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 78b5c8b867e2b838708425d022d769b605f2b637..43e1aa7ecef78cb27c98a9c9d0b7c100f904abde 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,9 +38,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index 631af0857d7858ed9cd020a5e2801c7c038234f0..1f9d3cb64c50d66aa7f10f48cdd5fc532eb36a90 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 #include "generic.h"
 
 static void __init at91eb01_map_io(void)
index 58ae7a6c240587443187888f7b2fdf381ac46d2a..528656761ff74d390ee8d5c4c71d467679164b83 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -34,8 +34,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 665d3091bafd14aefb8c7cf80b413985faccde72..bfeee8a2af285a4e307be42c94a922de0626d007 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -36,8 +36,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index dbe79df1f0aba26bc5cc5e80f8a07d3ef0f29f76..60626e7a3490d4c3e1424a5e2da4a8781c473d45 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,9 +38,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index 16577a064715ed28015492bd23c34594f1968b9b..a87956c0a74f325adb7d5b9e6247b47ff691b071 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -33,8 +33,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 6054e982e289d68ae50effbc7c7d0f7a9b2dce81..fe9b9913fa3cd98eeacf1604b76351fa7de5d24a 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index ea39c6c186eb82bdc8492aeefe55a9ab78518910..dbc912d633c76b4e52bba9374b55cb77a2e4a9c2 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -36,9 +36,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index 5393b8079bd7cdc0c45af804812b1563a50f2848..4c28413426c216f738d59ad0485fecb94875e691 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/input.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -39,9 +39,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 
index fe8a8ac89d6427af244a64cedaeca54fb46e93ff..e4910cb26c16876cb63e8d3acac1704ff6ba01f5 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -36,8 +36,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 6f3b377dc37896884d5c3ad40458aff40ed05ccd..cb20e70b3b06293b405172fc82c575b957de3ccf 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/spi/at73c213.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -37,8 +37,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 9d3c65e79c36bc657e7b7d7cf2041e1d3783a353..1a9963b811c790e061fe490b4521b86db7fedf72 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -44,9 +44,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 334b159285c3e3c8500cb9f37a126e5603f8a40f..b1d11960a735f75dee6b4d982b4023e390088bf0 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -41,9 +41,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index f0975bba6d513c2d359e30ffc779814e03189357..d4eba5c0ce0262ae2b5885d7022ddb3cc38e6e87 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/spi/at73c213.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -35,8 +35,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
index 5271200b6dede6729f54804b9e9d69f31a175005..c6dce49c388c92b70a35b807dcfe9bbde907b567 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -27,9 +27,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
index 4048e47c5190ba7254144532a8b6c9b2755db54b..f9d0b65da40b1bbfaf3472c0eb52070b7f9d7549 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/input.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -39,9 +39,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 
index a2b94947f5754a0a0d98c9ca530888ffc8e6b13c..673e5c27214d93f8833357bee27fc91265c6e425 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,9 +38,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91_shdwc.h>
 
 #include "generic.h"
 
index 0aa3ddaf3d659612c828ae301f36f75c42a1a448..36b380aad006d9c5fd32a9a986c58b6b47abaf81 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -42,9 +42,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
index daebd72a629458d161665a85557709971975518b..f5c2847161f582906f21bd686e03da07ed9bff0c 100644 (file)
@@ -25,9 +25,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/cpu.h>
+#include <mach/hardware.h>
+#include <mach/at91_pmc.h>
+#include <mach/cpu.h>
 
 #include "clock.h"
 
index 4db221e03457613f5932378a7a41e15f19c5a6a6..8392d5b517f15bc5dad300565188e4dafcccfe46 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/module.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>
+#include <mach/at91_pio.h>
+#include <mach/gpio.h>
 
 #include "generic.h"
 
similarity index 98%
rename from include/asm-arm/arch-at91/at91_adc.h
rename to arch/arm/mach-at91/include/mach/at91_adc.h
index 6d71ea2637b1927c24b5b430acc19f0d13686e89..8e7ed5c9081758291c8eddf9837b8869a7154250 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91_aic.h
rename to arch/arm/mach-at91/include/mach/at91_aic.h
index df44c12a12d4dd53e5ed1780eb74dc0a551a9a37..03566799d3bee4e1ade7161dae8594acb95c95ed 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-at91/at91_dbgu.h
rename to arch/arm/mach-at91/include/mach/at91_dbgu.h
index 8019ffd0ad3b61a23ee920a3b6b79e2009b16ec6..6dcaa7716871807d906b07b6a8cef70762c6a115 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91_mci.h
rename to arch/arm/mach-at91/include/mach/at91_mci.h
index 400ec10014b45b8ee2b5782ef84e8339305e12b4..550d503a1bca1511ed6c93bff65ebc92d1d78e5a 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-at91/at91_pio.h
rename to arch/arm/mach-at91/include/mach/at91_pio.h
index 84c3866d309f84ce818042a6b0ecd3736d40f0ff..c6a31bf8a5c6973b93ba8856191ca2bf04bde665 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-at91/at91_pit.h
rename to arch/arm/mach-at91/include/mach/at91_pit.h
index 5026325a5ae419b13cad93db555f2b1f79a74983..0448ac36eadb29d5bbc7194484ea80a2639cf125 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-at91/at91_pmc.h
rename to arch/arm/mach-at91/include/mach/at91_pmc.h
index 2001e81f226780b0764bbf7fc9bb7d30ee06593b..2e3f2894b70496535660883a29fd21cd0bf76deb 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-at91/at91_rstc.h
rename to arch/arm/mach-at91/include/mach/at91_rstc.h
index fb8d1618a231a40b2d23387344b53cd09a5828fd..7cd1b39aaa43a4ffcbef66ce5c3e13521fe8d458 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-at91/at91_rtc.h
rename to arch/arm/mach-at91/include/mach/at91_rtc.h
index af9bd28174c05708cd3facfed783900deb8526c2..e56f4701a3e58b4fdfd37b1948d93e483b2a2139 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-at91/at91_rtt.h
rename to arch/arm/mach-at91/include/mach/at91_rtt.h
index 39a32633b275a3913a1d971ef74e19d64028ba07..71782e5d21591233f1394d8b02cac439b1143ece 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-at91/at91_shdwc.h
rename to arch/arm/mach-at91/include/mach/at91_shdwc.h
index 581fa41d90e8ac4111764885e20228a312bb5aec..60be5ae624f1089520c2cc43692108cd4a726fba 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-at91/at91_spi.h
rename to arch/arm/mach-at91/include/mach/at91_spi.h
index f9b9a84649974f532cb9be17ac98444811a9909c..2f6ba0c5636e6c7b0f51359aea1785c24ba9adb9 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91_ssc.h
rename to arch/arm/mach-at91/include/mach/at91_ssc.h
index 0ecc73460b5098145c707f8c0ff7500fa60cec08..a81114c11c74eda0d2f92e5c7d3804e16890d980 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-at91/at91_st.h
rename to arch/arm/mach-at91/include/mach/at91_st.h
index 30446e2ea772266600489e4daf93d5b537ce217b..8847173e4101b1977c78752eafc40560a0bc6046 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91_tc.h
rename to arch/arm/mach-at91/include/mach/at91_tc.h
index b85d3faeef5ced996ae088cdc8b745adea0fbb98..46a317fd7164e0057c54e7846b7e347acbca4827 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91_twi.h
rename to arch/arm/mach-at91/include/mach/at91_twi.h
index f9f2e3cd95c5766caed7ccb2772c930b8885ac61..bb2880f6ba37d520a9de1c897628d20bd221cca2 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-at91/at91_wdt.h
rename to arch/arm/mach-at91/include/mach/at91_wdt.h
index 1014e9bf181ff14645d76d2450981a21a349fdba..973b4526a98eec11a6e1defc3b3f4ada3e42f446 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-at91/at91cap9.h
rename to arch/arm/mach-at91/include/mach/at91cap9.h
index 6f14d9053ac71f5909244c90fad50f3ca02edfe8..4a4b64135a922a16ebb72e3c38e0c09acfc39361 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-at91/at91cap9_ddrsdr.h
rename to arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
index efdb23af1ee434780a4968e6ad6a428e0014dbde..bca878f3bd877ae9c731847459a31af734c0f4c4 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-at91/at91cap9_matrix.h
rename to arch/arm/mach-at91/include/mach/at91cap9_matrix.h
index ddbd4873c842e7fd12f50bec71b4ef3439d78281..4b9d4aff4b4f59d08d1ab4a1109f1933989c54ea 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-at91/at91rm9200.h
rename to arch/arm/mach-at91/include/mach/at91rm9200.h
index e8fc0b1c33f4423647a60db76fac50f85b7f49d2..78983155a074c74b18873deaa3d736b65f4a831e 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91rm9200_emac.h
rename to arch/arm/mach-at91/include/mach/at91rm9200_emac.h
index 0c417af5fe7ff89c4bcc18783feb71eaf86270b3..b8260cd8041cf568f46e029f758ba876e3c4619e 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91rm9200_mc.h
rename to arch/arm/mach-at91/include/mach/at91rm9200_mc.h
index 24d012939cc4921c9900f30e1d30cbf08889d765..d34e4ed89349639fc1c6bb5e3656da50c242006d 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/at91sam9260.h
rename to arch/arm/mach-at91/include/mach/at91sam9260.h
index 889872a3f2a9e8c1a8c65273b24b91a9b113a877..43c396b9b4cb8cc1ceedf44bf24fe62ff225c880 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/at91sam9260.h
+ * arch/arm/mach-at91/include/mach/at91sam9260.h
  *
  * (C) 2006 Andrew Victor
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9260_matrix.h
rename to arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
index a8e9fec6c7352ad5ff7441d3f0aa315df42ae689..f027de5df956441d02280fecfc1acdd33509bf9a 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9261.h
rename to arch/arm/mach-at91/include/mach/at91sam9261.h
index c7c4778dac49bed468e44eab6a23a32dd468789a..3a348ca20773c37fae486c24b27bbf23cb2b2160 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/at91sam9261.h
+ * arch/arm/mach-at91/include/mach/at91sam9261.h
  *
  * Copyright (C) SAN People
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9261_matrix.h
rename to arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
index 6f072421be5b9b36cf7b683e21d3da8419dbf7b0..db62b1f18300075be68ca16fd83a212e26ad94aa 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-at91/at91sam9263.h
rename to arch/arm/mach-at91/include/mach/at91sam9263.h
index 018a647311da97590a21677931ea21a8899301ea..2091f1e42d43c32931f7f6b327f4a056a8f54bbf 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/at91sam9263.h
+ * arch/arm/mach-at91/include/mach/at91sam9263.h
  *
  * (C) 2007 Atmel Corporation.
  *
similarity index 99%
rename from include/asm-arm/arch-at91/at91sam9263_matrix.h
rename to arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
index 72f6e668e4143b5245fb7976677b6b53ae7f3448..9b3efd3eb2f39e121591fe7a5aa3e5f97adc9f44 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9_sdramc.h
rename to arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
index d3b8b3da6b4d783030990eb2fede7ab892e89d36..1921181c63ca8991c72bc6ee4abfd15eba572815 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9_smc.h
rename to arch/arm/mach-at91/include/mach/at91sam9_smc.h
index 9e49eed31e507a674c4190ba70d36b132390ae9d..ec6ad1338b5a5eba7900db99ab39bf9cdf2b38b8 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9rl.h
rename to arch/arm/mach-at91/include/mach/at91sam9rl.h
index 622e56f81d42d791c4d82eb260456925c570ab8e..fc2de6c09c86a67c21073e405144ad17d94f8f64 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/at91sam9260.h
+ * arch/arm/mach-at91/include/mach/at91sam9260.h
  *
  *  Copyright (C) 2007 Atmel Corporation
  *
similarity index 98%
rename from include/asm-arm/arch-at91/at91sam9rl_matrix.h
rename to arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
index 84224174e6a1eb8c10af27dbf2f6dbdea3a41674..5f9149071fe5eaa1b2f4d438391e52d5a1f75eaa 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-at91/at91x40.h
rename to arch/arm/mach-at91/include/mach/at91x40.h
index 612203e0177fb7284ad0066cf9d3e84ab3d43b23..d34cdb8abdca652dfcc64523e089361ed3ff2c0e 100644 (file)
@@ -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>
  *
similarity index 99%
rename from include/asm-arm/arch-at91/board.h
rename to arch/arm/mach-at91/include/mach/board.h
index 48bbd854f57d7690e1f3dbbf34ecf41b65560e4d..acd60f2a0724ad6c67f29f77eb0df7f4ed1d7988 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/board.h
+ * arch/arm/mach-at91/include/mach/board.h
  *
  *  Copyright (C) 2005 HP Labs
  *
similarity index 96%
rename from include/asm-arm/arch-at91/cpu.h
rename to arch/arm/mach-at91/include/mach/cpu.h
index f24b55c9083fb677f646ee6e88e3df473e06ea61..dbfd9f73f80bb4aa531e8a6ec063de0082fb2195 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-at91/debug-macro.S
rename to arch/arm/mach-at91/include/mach/debug-macro.S
index ff28696b6d9009ca2450172202ab47d462708672..29052ba66adac42eb0ee585ecd8bc64e09d9da59 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-at91/dma.h
rename to arch/arm/mach-at91/include/mach/dma.h
index 774565412beb55ded758e6c27a2731d8ce7a0ce3..e4f90c1776165aaf76136ff65054015e944c5bf3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/dma.h
+ * arch/arm/mach-at91/include/mach/dma.h
  *
  *  Copyright (C) 2003 SAN People
  *
similarity index 90%
rename from include/asm-arm/arch-at91/entry-macro.S
rename to arch/arm/mach-at91/include/mach/entry-macro.S
index cbaf6050154a82c0e2d92bcf13e7b3dae923e331..7ab68f972227fb2998cfdd0dfe9910a74670def8 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-at91/gpio.h
rename to arch/arm/mach-at91/include/mach/gpio.h
index 0a241e2fb672212b52293872dcb445e53c081be3..76d76e2fa69ef108021b521291f728cc79152182 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/gpio.h
+ * arch/arm/mach-at91/include/mach/gpio.h
  *
  *  Copyright (C) 2005 HP Labs
  *
similarity index 89%
rename from include/asm-arm/arch-at91/hardware.h
rename to arch/arm/mach-at91/include/mach/hardware.h
index 016a3a3f663395a32a998b910d47f828a714fdf8..da0b681c652cf12b53a8a47d633a9fd23a955610 100644 (file)
@@ -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
 #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
similarity index 97%
rename from include/asm-arm/arch-at91/io.h
rename to arch/arm/mach-at91/include/mach/io.h
index f8beaa228467814af3b188b5803956ab3beacc33..1611bd03f52892ca846f56f4adc8801e4c85e362 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/io.h
+ * arch/arm/mach-at91/include/mach/io.h
  *
  *  Copyright (C) 2003 SAN People
  *
similarity index 95%
rename from include/asm-arm/arch-at91/irqs.h
rename to arch/arm/mach-at91/include/mach/irqs.h
index 70b1216dce5dad3718b04fc1fa44b3d8a3810893..bda29ccbcd9484a11c6b15210856beae2ff1ee80 100644 (file)
@@ -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
 
similarity index 94%
rename from include/asm-arm/arch-at91/memory.h
rename to arch/arm/mach-at91/include/mach/memory.h
index 904fbd60f0e48b979cee06f8593dfc81cb79ae55..9dd1b8c79b08cad32628745d1956d742c9c7712e 100644 (file)
@@ -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)
 
similarity index 91%
rename from include/asm-arm/arch-at91/system.h
rename to arch/arm/mach-at91/include/mach/system.h
index c5e3d03572636a2479d5ac3dcdfd6ce674353131..e712658d966cdd83f7576f5a4856930173e306df 100644 (file)
@@ -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)
 {
similarity index 96%
rename from include/asm-arm/arch-at91/timex.h
rename to arch/arm/mach-at91/include/mach/timex.h
index 67c86a89828f8ce2019d1c8f03b30f069f20214f..d84c9948becf5f64a730bee50a3d3c598470883d 100644 (file)
@@ -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)
 
similarity index 97%
rename from include/asm-arm/arch-at91/uncompress.h
rename to arch/arm/mach-at91/include/mach/uncompress.h
index f5636a8f6132989de20acf64b6e04fdcbbf3245d..0410d548e9b1fa4426f6cfb192d5fbf08e1fc0a4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/uncompress.h
+ * arch/arm/mach-at91/include/mach/uncompress.h
  *
  *  Copyright (C) 2003 SAN People
  *
similarity index 95%
rename from include/asm-arm/arch-at91/vmalloc.h
rename to arch/arm/mach-at91/include/mach/vmalloc.h
index bb05e70e932aabe7cf236dced09946bcbbc2711a..8eb459f3f5b7a4c43769c2283bba785ce17131be 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91/vmalloc.h
+ * arch/arm/mach-at91/include/mach/vmalloc.h
  *
  *  Copyright (C) 2003 SAN People
  *
index a1bfc12a0c23dd296944ffc3df5f969552916775..da3494a534230cd3f4e7c04be4ab714a8061d4f3 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
 
index f064b7acb011a8b84b17232ae1e770d80235a6e6..fec03c59ff94f382a9026bf699a95b00bd7804e0 100644 (file)
@@ -13,8 +13,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 
 /* ------------------------------------------------------------------------- */
index a5cfe866c9ddf2915f12d50c6eccb814b961fb29..ec2fe4ca1e270e3aec4fddd84b5f71019ee7117a 100644 (file)
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/cpu.h>
+#include <mach/at91_pmc.h>
+#include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 #ifdef CONFIG_ARCH_AT91RM9200
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/at91rm9200_mc.h>
 
 /*
  * The AT91RM9200 goes into self-refresh mode with this command, and will
@@ -41,7 +41,7 @@
 #define sdram_selfrefresh_disable()    do {} while (0)
 
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9_ddrsdr.h>
+#include <mach/at91cap9_ddrsdr.h>
 
 static u32 saved_lpr;
 
@@ -58,7 +58,7 @@ static inline void sdram_selfrefresh_enable(void)
 #define sdram_selfrefresh_disable()    at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr)
 
 #else
-#include <asm/arch/at91sam9_sdramc.h>
+#include <mach/at91sam9_sdramc.h>
 
 #ifdef CONFIG_ARCH_AT91SAM9263
 /*
@@ -91,8 +91,8 @@ static inline void sdram_selfrefresh_enable(void)
  */
 #if defined(AT91_SHDWC)
 
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_shdwc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_shdwc.h>
 
 static void __init show_reset_status(void)
 {
index 25d18b738bd882b4e1f19a66a496fb317ae2bd2e..474616dcd7a688a92cb39b813b58d822f5eb2041 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/sizes.h>
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -33,7 +33,7 @@
 #include <asm/page.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/autcpu12.h>
+#include <mach/autcpu12.h>
 
 #include "common.h"
 
index 8520cb0fdab79fda72d19c73f7f249219ad50121..aa02aa5a01f4a61c42ae3bf5832da36cf446d509 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
index 9444ab1ffaa58d4cc6cffa2797d68ec1c0eb48ef..8ada2018497871ef25d414c583af7fa0f0f41b51 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <linux/kernel.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/sizes.h>
index 06f64ec57ae4ebe25978ca34c63e623c078b8f10..c58e32ec4c5d822203c7e438d47ee499a7b75a8f 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/sizes.h>
index c457a35de4ec709a738f8158ab9e8263db082b40..7122b3d2104347afb0abf0c963a476daa8da1e3d 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/init.h>
 #include <linux/initrd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
similarity index 94%
rename from include/asm-arm/arch-clps711x/debug-macro.S
rename to arch/arm/mach-clps711x/include/mach/debug-macro.S
index bc0a5760722b2edf2fae852319fcddd89c4ea28f..64baf9f874087c8df7f7fc47e83c4c189f592978 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-clps711x/dma.h
rename to arch/arm/mach-clps711x/include/mach/dma.h
index 61099793842301804ba51622de5a5eba45dd9165..0d620e8695361988cd5aa89a1a5598749cb04610 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-clps711x/entry-macro.S
rename to arch/arm/mach-clps711x/include/mach/entry-macro.S
index 3554887cbccb5ec6c0656829dec2dc24f553c447..90fa2f70489f07d846d77bae32226b4c79bcefbe 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-clps711x/hardware.h
rename to arch/arm/mach-clps711x/include/mach/hardware.h
index 0fdbe72fff2afc7a9f50030fa2d942eb13767c67..4c3e101b96c9582fcaf6473a5824fa9e10705f56 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-clps711x/io.h
rename to arch/arm/mach-clps711x/include/mach/io.h
index 2b84dac8b2fa65b970371a9728b5849dc1d9a2aa..4c8440087679cb0548b2b3481b92be97552f7132 100644 (file)
@@ -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
 
similarity index 96%
rename from include/asm-arm/arch-clps711x/irqs.h
rename to arch/arm/mach-clps711x/include/mach/irqs.h
index 76025dc87637c8145b19a222b9cb9c9f11461d0a..30b7e97285a4c0b48cd721736d1dbc163223b643 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-clps711x/memory.h
rename to arch/arm/mach-clps711x/include/mach/memory.h
index 42768cc8bfb41aecf34eda2a5130b72a3fcdd94b..71c2fa70c8e8be28a43937481b08efb8b0550c62 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-clps711x/syspld.h
rename to arch/arm/mach-clps711x/include/mach/syspld.h
index 960578a22a8eb815e580818b0b496d179eb04516..f7f4c120189807e8e0eea32b89b960f59fffebbd 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/arch-clps711x/system.h
rename to arch/arm/mach-clps711x/include/mach/system.h
index 1f561772bee409e74068212b2365059f78f4909f..a8eade40317f007e932aed39320fa90e3b844e1e 100644 (file)
@@ -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>
 
similarity index 96%
rename from include/asm-arm/arch-clps711x/time.h
rename to arch/arm/mach-clps711x/include/mach/time.h
index 5edaae1c61d315a4ee2f36a11c08c36a6423b0b8..8fe283ccd1f3dc75aa64d20466649f1aa052156b 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-clps711x/timex.h
rename to arch/arm/mach-clps711x/include/mach/timex.h
index dcbb381da3ddcc2bcf7dcec1e04ff29ead3734d1..ac8823ccff9397c4510099bb426699c875bc03fd 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-clps711x/uncompress.h
rename to arch/arm/mach-clps711x/include/mach/uncompress.h
index 8c5684ad086e8f40b4243357d32f65ac7eb14680..7164310dea7cdbbfc950242cd9c8f7da2006bc66 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-clps711x/vmalloc.h
rename to arch/arm/mach-clps711x/include/mach/vmalloc.h
index a5dfe96abc96de2fd69c00224e82447ac0c50c94..ea6cc7beff287939e117cbc57beed7f3ffa5e155 100644 (file)
@@ -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.
  *
index 6954a7a49156d3c9860cb5b94bde201a4fbc50cf..38623cfcac5a0a0d43094b9d09bc09533c2fb06e 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/list.h>
 
 #include <asm/mach/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index 43c2fa8f481711066eda707dcde5fb22fe5f68db..a7b4591205a3d484f8713ef35b619ac4140648cc 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/bootmem.h>
 
 #include <asm/sizes.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/mach/map.h>
index a9b9c5b847e282a6eb027082bb6cc094326f8748..262c3c361453adaa74dbd7b9dddbce6292a614f0 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/system.h>
index 80d8fd28b2f100b328282d41664487a4a912e4f0..f51f97d4f212b9c0b1e628da53cbd83a9603c396 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/syspld.h>
+#include <mach/syspld.h>
 
 #include "common.h"
 
index d922a891b1ada18b5aff74b6cabcad1e922af8d9..ef1fcd17189e16bd43538da60e53ea0103d351b0 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/irq.h>
 #include <linux/sched.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
 #include <asm/io.h>
index cfd8aca9f7da27a822c58c087a93833e64d2f07e..cc1b82179e83c03c3a8a46bc29127dc201829c28 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
 #include <asm/io.h>
 #include <asm/irq.h>
similarity index 90%
rename from include/asm-arm/arch-cl7500/debug-macro.S
rename to arch/arm/mach-clps7500/include/mach/debug-macro.S
index 9a2b67d240985fad4d00540e688c1a588952af39..af4104e7e84a34989b54e9879edbdd16586b8df5 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-cl7500/dma.h
rename to arch/arm/mach-clps7500/include/mach/dma.h
index 591ed25518929d9cc46cf6307ee600ce7473b15c..63fcde50549823e9aea96050be83c50cfe03770c 100644 (file)
@@ -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.
  */
similarity index 91%
rename from include/asm-arm/arch-rpc/entry-macro.S
rename to arch/arm/mach-clps7500/include/mach/entry-macro.S
index 5bd55557cccacde815b4ee590551cb84c1693402..4e7e541440934a81bcd68ee0822370c96be105db 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-cl7500/hardware.h
rename to arch/arm/mach-clps7500/include/mach/hardware.h
index 1adfd18e6154ba116c1121bb76825afdb489cd53..d66578a3371c9f0a972a8266497e37519446875e 100644 (file)
@@ -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__
similarity index 98%
rename from include/asm-arm/arch-cl7500/io.h
rename to arch/arm/mach-clps7500/include/mach/io.h
index 80f9b19cac9e90f602684184860a6a2ef01915a5..2ff2860889edec68c2e2f3c712b4fb2b7d4bcb43 100644 (file)
@@ -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
 
similarity index 93%
rename from include/asm-arm/arch-cl7500/irq.h
rename to arch/arm/mach-clps7500/include/mach/irq.h
index 4b286331f3f8b56efe7a902ebb72bfd70dec8db7..e8da3c58df76074da487c1fbc6c49a4fb6ac78ad 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-cl7500/irqs.h
rename to arch/arm/mach-clps7500/include/mach/irqs.h
index f20996eadf1962a39573b7cc9497a6e9961f6635..bee66b487f59617a9a01c328768c7be07ae90185 100644 (file)
@@ -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
  */
similarity index 94%
rename from include/asm-arm/arch-cl7500/memory.h
rename to arch/arm/mach-clps7500/include/mach/memory.h
index 3178140e24cae0b07e23ff01de8856962c006ffb..3326aa99d3eceda08e3ca78288e11ca110da6e82 100644 (file)
@@ -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.
  *
similarity index 87%
rename from include/asm-arm/arch-cl7500/system.h
rename to arch/arm/mach-clps7500/include/mach/system.h
index a9505d6a74d7c194f96ab1d51d9828f31c8cfaab..624fc2830ae0b34ec7ae576bd417b81985ede221 100644 (file)
@@ -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.
  */
similarity index 79%
rename from include/asm-arm/arch-cl7500/timex.h
rename to arch/arm/mach-clps7500/include/mach/timex.h
index 8a4175fc01060788b4cae4bfc4bd605c9ad7cd01..dfaa9b425757f96b4f5a61ca16591509c78a0924 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-cl7500/timex.h
+ * arch/arm/mach-clps7500/include/mach/timex.h
  *
  * CL7500 architecture timex specifications
  *
similarity index 93%
rename from include/asm-arm/arch-cl7500/uncompress.h
rename to arch/arm/mach-clps7500/include/mach/uncompress.h
index c437e0c88c3f9c94f95cda9bab906654672b1c21..d7d0af4b49fce899b562b2b702ba4cee3f3de4cf 100644 (file)
@@ -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.
  */
similarity index 55%
rename from include/asm-arm/arch-cl7500/vmalloc.h
rename to arch/arm/mach-clps7500/include/mach/vmalloc.h
index ba8d7a84456a355d94f0bea59ccbce9437bb7b69..8fc5406d1b6d2c5be613a80b8f8eedfdd9e69986 100644 (file)
@@ -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)
index 7497619e4a8a1908ed32f404d71e26fe426b2df3..1343557878143def00bd7254d284e0f6841f8e24 100644 (file)
 #include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/common.h>
+#include <mach/common.h>
 
 /* other misc. init functions */
 void __init davinci_psc_init(void);
index 0014fb1c6eba57bc642791fa24e519f750531675..d46c69b55aaab73f6afffcd282bcecae74e1510e 100644 (file)
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/psc.h>
+#include <mach/psc.h>
 #include "clock.h"
 
 /* PLL/Reset register offsets */
index 9c67886e71895a2cf81f99f31c34403660992dc1..c9cb4f09b18ffd88689315a5f48c7aff6b68f45d 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/irq.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/irqs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
+#include <mach/irqs.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
 
 #include <asm/mach/irq.h>
 
similarity index 92%
rename from include/asm-arm/arch-davinci/clock.h
rename to arch/arm/mach-davinci/include/mach/clock.h
index cc168b7a14f27c35d2311ce8e631ac7761865003..38bdd49bc181d4f5fc27aa5099f4176d84f17b22 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-davinci/entry-macro.S
rename to arch/arm/mach-davinci/include/mach/entry-macro.S
index 3ebfcc5cb58e2f706e84cc2a551755a66ecf59bc..039b84f933b327742460ef7bdb13ae9ecedfb0e6 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-davinci/gpio.h
rename to arch/arm/mach-davinci/include/mach/gpio.h
index 54fda734649f671e233258901c01f6645d01f51f..ec151ccf1e8f3a951cbd8933810d80d602c0e1b9 100644 (file)
@@ -14,7 +14,7 @@
 #define        __DAVINCI_GPIO_H
 
 #include <linux/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * basic gpio routines
similarity index 95%
rename from include/asm-arm/arch-davinci/serial.h
rename to arch/arm/mach-davinci/include/mach/serial.h
index ed418ef76805748e92bf1c3189a870c1ee26f290..fb8cb229bfd2a14b33f8232560d0dff7aec4b481 100644 (file)
@@ -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)
similarity index 95%
rename from include/asm-arm/arch-davinci/system.h
rename to arch/arm/mach-davinci/include/mach/system.h
index 6713e4a44ee88a0038111cc822276dc0c634a6a5..84ff77aeb7383b4284a8bd61e02ea26d0925e2da 100644 (file)
@@ -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);
 
similarity index 96%
rename from include/asm-arm/arch-davinci/uncompress.h
rename to arch/arm/mach-davinci/include/mach/uncompress.h
index f6d1570f720632cf57864cf4420de9a074f1ce3a..8c165def37b6d853f958db165de5b315ef48526d 100644 (file)
@@ -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 */
 
similarity index 95%
rename from include/asm-arm/arch-davinci/vmalloc.h
rename to arch/arm/mach-davinci/include/mach/vmalloc.h
index 9b47fa89b33396076c8d59984874a5ae6bf3e574..b98bd9e92fd687b48a660a92edb0814cd1123d3c 100644 (file)
@@ -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))
index 47787ff84a6ad19f9fd9ab455e9cc4d1762bdbfd..5bb66b61c1a32214d7dee09102ee1cad203f9996 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/memory.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 extern void davinci_check_revision(void);
 
index 090580ed88ef321cea44e79ebd739716d557f99c..12ca9f29f84735267a478abd7b8baa7a6c621f7f 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/irq.h>
 
index 439bf94bdc4ea8ffd66fab207b349ad6d3bc45e5..8ff9d8aca60b724e456f3ded4279f6177a8abe87 100644 (file)
@@ -11,9 +11,9 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 /* System control register offsets */
 #define PINMUX0         0x00
index 753f0ba81a4409e661d248dc2639d8c19cc7aca2..720c48b9ee0404257cd218a3fe26b66a035a653d 100644 (file)
@@ -23,9 +23,9 @@
 #include <linux/init.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/psc.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/psc.h>
+#include <mach/mux.h>
 
 /* PSC register offsets */
 #define EPCPR          0x070
index c2b812f3391cf65f23024719a5883051d8258e07..caf101e2cc62ba027715b8f37f03384e08da227a 100644 (file)
@@ -29,9 +29,9 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/serial.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/serial.h>
+#include <mach/irqs.h>
 
 #define UART_DAVINCI_PWREMU 0x0c
 
index 50c3b54c4ccdd140f5884ea409db7d816612cefd..206e80d41717b79fb6c647e14e463c1217c0f16e 100644 (file)
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 #include <asm/errno.h>
-#include <asm/arch/io.h>
+#include <mach/io.h>
 
 static struct clock_event_device clockevent_davinci;
 
index 31f4f213cce37c7a14fe1d4d9d2c6c5a5ba64c28..65cc7c2719175e3eec4a948f5f52e8a3e771179f 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/serial_8250.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/setup.h>
similarity index 90%
rename from include/asm-arm/arch-ebsa110/debug-macro.S
rename to arch/arm/mach-ebsa110/include/mach/debug-macro.S
index 9213bfe4831d6f2e716348d9d9d9976b404b9cd1..1dde8227f3a274d33d32f28a4b9d89cf9b56ac9f 100644 (file)
@@ -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
  *
similarity index 85%
rename from include/asm-arm/arch-ebsa110/dma.h
rename to arch/arm/mach-ebsa110/include/mach/dma.h
index c52f9e2ab0bb53f9dd0a316e19b02e3b39edb8c6..780a04c8bbe963c8eb250f6d12c1380fb69f41eb 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-ebsa110/entry-macro.S
rename to arch/arm/mach-ebsa110/include/mach/entry-macro.S
index f242be5c49bad2d0abdb4cee702c200202cf1150..cc3e5992f6b36b1d8a18a8674a1fbd5d6316f16d 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-ebsa110/hardware.h
rename to arch/arm/mach-ebsa110/include/mach/hardware.h
index 3ce864def41efc2cd17c8b60aa1ff63e7e85b7ec..4b2fb7743909793e125c7836e84bd215488f04a0 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-ebsa110/io.h
rename to arch/arm/mach-ebsa110/include/mach/io.h
index 44a4001de80786c05e5fa47630f2b805d15fa518..f68daa632af02e8a0bd2b6bbda06b58e100cbf6e 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-ebsa110/irqs.h
rename to arch/arm/mach-ebsa110/include/mach/irqs.h
index ded9bd9d7b8b45b96caf0613f0ef0ddd016332f2..a8f3771bc060c74cfa96505ef16ebfb16c05c10a 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-ebsa110/memory.h
rename to arch/arm/mach-ebsa110/include/mach/memory.h
index c7c500e176d0e3727414e5eb0084f8b24851d092..eea4b75b657bb730cf978e633a0d1ef395c33d48 100644 (file)
@@ -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.
  *
similarity index 95%
rename from include/asm-arm/arch-ebsa110/system.h
rename to arch/arm/mach-ebsa110/include/mach/system.h
index d7c8fece0bc599cdbdce7959d0596bd16d93297a..350a028997efddc34c8a87606928a0ebc25eef85 100644 (file)
@@ -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.
  *
similarity index 90%
rename from include/asm-arm/arch-ebsa110/timex.h
rename to arch/arm/mach-ebsa110/include/mach/timex.h
index 1e9ef045092b7607da5e123599f1837044e9c189..4fb43b22a102d348645f62529a2ea673ed89308a 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-ebsa110/uncompress.h
rename to arch/arm/mach-ebsa110/include/mach/uncompress.h
index ae5b775eb0b7517b4e57dae2bee61250d2f7b1c9..32041509fbf84c2f393f32b2d7807f03f7af2036 100644 (file)
@@ -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
  *
similarity index 85%
rename from include/asm-arm/arch-ebsa110/vmalloc.h
rename to arch/arm/mach-ebsa110/include/mach/vmalloc.h
index 26674ba4683c9fff313157d70ec6068c3f173107..9b44c19e95ec5167af7b5607ae5ff05a58e7e4f9 100644 (file)
@@ -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
  *
index a2027adeefcbb45b4d092aa11dc13133a37d7697..53748f5462e9844250638af78a094a557fc07fb6 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/page.h>
 
index b16d01679772fa6e2156c3fe21e8ac6bf5620603..6a6ea57c2a4e9a79700b45c45d3893e723c20c3a 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
index 8f87f8a41483d9566eb8512af68b650008f08174..aa1fb352fb8f6fb1c64cc0f216e3d3e62568f90c 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 4642c70f21e084a4864b233762313f18de51eaec..6062e47f204322b211ad6a0080294c1a32532f2a 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <asm/div64.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 struct clk {
index b49da117af9bdd129070768c9b1ddd6f33de3e7d..f99f436693928d36adf25aad1cbac3a9e7e35e60 100644 (file)
@@ -36,7 +36,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
@@ -46,7 +46,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #include <asm/hardware/vic.h>
 
index 1650ec724228d7d38fa514d6d79a65211116cf78..97550c0ad7b045adc41a513895687a590d0d75a2 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 00208ce6e6207143d5c79da09522b3a1ab0cbd88..99b01d44bf1cf09fe1577f1d577025301e7e813c 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 78d04aeca4633f59c46739a283af1b0806d72923..9fb72d01a36c2a9dd868f06536fb962491e9b0a9 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index d658fb2f574b2c989e1fff5cdc8c2bbf1a352185..87267a574f5ea5f5813943f4408cfca5823a5fb1 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 4fd1cd671521e915ffd8d1a6401fc97827d0558f..7e373950be4d386fe3cdfe33fce1e8d47413b55a 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 44dacbac863582735305edff9cbced15f3f0cda9..08a7c9bfb689bc6473052e21b0aeaee9df9b33d2 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index cc80031b4ef86c111439bf5f38144537378f2ba9..9b41ec1f089e78201f05191f94dc1389ec9f06a9 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index dc2e4c00d9893faad23209ae73afb499be9b27b7..0f3fb87ca4be778f33b2b8e48848c6761b0ecd92 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/seq_file.h>
 
-#include <asm/arch/ep93xx-regs.h>
+#include <mach/ep93xx-regs.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
similarity index 87%
rename from include/asm-arm/arch-ep93xx/debug-macro.S
rename to arch/arm/mach-ep93xx/include/mach/debug-macro.S
index 397565a0c6714578180658dc350515e1041de76b..802858bc80958b90358aec6ac399d509efe73193 100644 (file)
@@ -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/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h
new file mode 100644 (file)
index 0000000..d0fa965
--- /dev/null
@@ -0,0 +1,3 @@
+/*
+ * arch/arm/mach-ep93xx/include/mach/dma.h
+ */
similarity index 93%
rename from include/asm-arm/arch-ep93xx/entry-macro.S
rename to arch/arm/mach-ep93xx/include/mach/entry-macro.S
index 241ec221a0471e4bef8f71a253e5db061ce394d1..96b85e2c2c0b73532cd2a3299e6ab59cb9f9afa6 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-ep93xx/ep93xx-regs.h
rename to arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index 625c6f0abc030c50b5fab0f1014dae6deaeebd3b..9f4458c8e07041658c0d6a9452b435104572cdd3 100644 (file)
@@ -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/arch/arm/mach-ep93xx/include/mach/gesbc9312.h b/arch/arm/mach-ep93xx/include/mach/gesbc9312.h
new file mode 100644 (file)
index 0000000..21fe2b9
--- /dev/null
@@ -0,0 +1,3 @@
+/*
+ * arch/arm/mach-ep93xx/include/mach/gesbc9312.h
+ */
similarity index 99%
rename from include/asm-arm/arch-ep93xx/gpio.h
rename to arch/arm/mach-ep93xx/include/mach/gpio.h
index 186e7c715f8afdb734e1b16a9ed9848a619fdbb4..f7020414c5df20a1414d3b773962e123cbf562d5 100644 (file)
@@ -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
similarity index 81%
rename from include/asm-arm/arch-ep93xx/hardware.h
rename to arch/arm/mach-ep93xx/include/mach/hardware.h
index 4233f6e85150d5537f794acadd26fff332da599b..529807d182bf2c28a8b47350dec7c2eb942cb12d 100644 (file)
@@ -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
similarity index 72%
rename from include/asm-arm/arch-ep93xx/io.h
rename to arch/arm/mach-ep93xx/include/mach/io.h
index 7b4d25e290606a26d390f4df0cd04eb97ce8aecd..1ab9a90ad33949b4dee55331eff8762fd21e59fe 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-ep93xx/irqs.h
rename to arch/arm/mach-ep93xx/include/mach/irqs.h
index 53d4a68bfc88af8fb40b6ff061117a18583b2b44..ff98390bbf0ffebd4c21481bd8a279cb03b8c020 100644 (file)
@@ -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
similarity index 81%
rename from include/asm-arm/arch-ep93xx/memory.h
rename to arch/arm/mach-ep93xx/include/mach/memory.h
index 4b1a5c7c83639b7101e7b77c9a2406bfe7854be2..f1b6335907528401dee36181bae3c01b79869211 100644 (file)
@@ -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
similarity index 85%
rename from include/asm-arm/arch-ep93xx/platform.h
rename to arch/arm/mach-ep93xx/include/mach/platform.h
index 44eccec2cba45d36f69a6ac11e097feb250ca307..b5c182473f5db271fa9a9abbe32a2ae5f38c7580 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ep93xx/platform.h
+ * arch/arm/mach-ep93xx/include/mach/platform.h
  */
 
 #ifndef __ASSEMBLY__
similarity index 85%
rename from include/asm-arm/arch-ep93xx/system.h
rename to arch/arm/mach-ep93xx/include/mach/system.h
index f1a5acf519199f3d351804cee2d485b9dc20bc5d..67789d0f329e5013c3072e7a5ffa91a633ef18c8 100644 (file)
@@ -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/arch/arm/mach-ep93xx/include/mach/timex.h b/arch/arm/mach-ep93xx/include/mach/timex.h
new file mode 100644 (file)
index 0000000..6b3503b
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-ep93xx/include/mach/timex.h
+ */
+
+#define CLOCK_TICK_RATE                983040
similarity index 98%
rename from include/asm-arm/arch-ep93xx/ts72xx.h
rename to arch/arm/mach-ep93xx/include/mach/ts72xx.h
index a94f63ff0535298d401996ee684fa09e97245ee3..30b318aa1a1f09627f69ec63a7d8c99d20507b93 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ep93xx/ts72xx.h
+ * arch/arm/mach-ep93xx/include/mach/ts72xx.h
  */
 
 /*
similarity index 95%
rename from include/asm-arm/arch-ep93xx/uncompress.h
rename to arch/arm/mach-ep93xx/include/mach/uncompress.h
index c15274c85d5d2683291382ef4cca0a16bf8a95cb..1fd2f17de3255b21ed8eec3f45db7298a38f2819 100644 (file)
@@ -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/arch/arm/mach-ep93xx/include/mach/vmalloc.h b/arch/arm/mach-ep93xx/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..aed21cd
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-ep93xx/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe800000
index 4d831ba799d58965d75ba65fd84a918cd6f244cb..de047a5c811256a4b50835cc7ab06220cfece58a 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/mtd/physmap.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
index c0bc642a5c182ece67a68bfee904c5a9d04e8f35..c3cbff126d0caa0e32b519fb30de5c0923d0140f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/m48t86.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
index c04c46c404f70816b133a14e3ca6bc3fad5a1e8a..4e10090cd87fb107cb82ab629826b5e420c7aa53 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
similarity index 95%
rename from include/asm-arm/arch-ebsa285/debug-macro.S
rename to arch/arm/mach-footbridge/include/mach/debug-macro.S
index b48cec4a0c45f083b4b40a67e5b21d695d2746f4..4329b81235708637cb6bc003638f7c3090a5c9f2 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-ebsa285/dma.h
rename to arch/arm/mach-footbridge/include/mach/dma.h
index 0259ad45d33c7ba3cfd6d1ddfea8ab058ab82a61..62afd213effb2818ea30a1245e8e616cc36672dc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/dma.h
+ *  arch/arm/mach-footbridge/include/mach/dma.h
  *
  *  Architecture DMA routines
  *
similarity index 95%
rename from include/asm-arm/arch-ebsa285/entry-macro.S
rename to arch/arm/mach-footbridge/include/mach/entry-macro.S
index e203c628d5000cf4335513595c1794f0e1c5d95c..d3847be0c66776e98b62ecce2e1d964dc4a81917 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-ebsa285/hardware.h
rename to arch/arm/mach-footbridge/include/mach/hardware.h
index 74610c2c63d498eab076363fca695d0c3d150ed9..ffaea90486f91dc98b9b5c60bd43d47e4ebd9794 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-ebsa285/io.h
rename to arch/arm/mach-footbridge/include/mach/io.h
index e88c6e230387a968ffc81c0bd0412f38be34d698..a7b066239996880bbeaec451dfb1386ce7fe452a 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-ebsa285/irqs.h
rename to arch/arm/mach-footbridge/include/mach/irqs.h
index 3e766f1cecf170bdc60145c781106c517416353b..400551e43e4efddd06c0c9751701a52769cb77b2 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-ebsa285/memory.h
rename to arch/arm/mach-footbridge/include/mach/memory.h
index 9019a3bf5ab946b05b533f9dbeda53efa2eaf3ba..e9cae99dd1f9881e1acdc5913ed2495efb49131a 100644 (file)
@@ -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.
  *
similarity index 95%
rename from include/asm-arm/arch-ebsa285/system.h
rename to arch/arm/mach-footbridge/include/mach/system.h
index a720bf7ca123fe67071805ae4b3539a257cdc61c..01c9f407f49833934b7dc11a95302bccee1d5840 100644 (file)
@@ -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>
 
similarity index 90%
rename from include/asm-arm/arch-ebsa285/timex.h
rename to arch/arm/mach-footbridge/include/mach/timex.h
index df60b3812d962cae34f3b93ec858756af8a2aa14..d0fea9d6d4abf649302c22914b97e6ee66a59096 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-ebsa285/uncompress.h
rename to arch/arm/mach-footbridge/include/mach/uncompress.h
index 86142c882b3a0fd9086ce82061875795f6daeb58..5dfa44287346a4c4b76f65e302842634cf3ddf73 100644 (file)
@@ -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
  *
similarity index 82%
rename from include/asm-arm/arch-ebsa285/vmalloc.h
rename to arch/arm/mach-footbridge/include/mach/vmalloc.h
index e487d7e8c8a60fc0e4a142ab8b68b2f64e6d3569..d0958d860a3cb52f16f9464cf625c13498f3ec73 100644 (file)
@@ -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
index b8e53d68c09319c95e400fc4984c40edb231232d..7132e522c3663ecd2e505a4f1c1ce410c093ba37 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/dec21285.h>
 #include <asm/irq.h>
 #include <asm/io.h>
index 2a2fbff75851e9d66e14bbc8565200b7bd904ee9..d91a4f4a32dc227161464b47abaa3eaee981e114 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
index bffba25dd262127611f43febc76bc86da57473ab..fd9a7c11d62d543c76c39cbde5af4880105a1c2a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-ebsa285/time.h
+ *  arch/arm/mach-footbridge/include/mach/time.h
  *
  *  Copyright (C) 1998 Russell King.
  *  Copyright (C) 1998 Phil Blundell
@@ -23,7 +23,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/bcd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/mach/time.h>
index 26aefae7f9ac796bb89add1a733a1de271fc5009..b5f9741ae13cd66220f28742924e2bd15b29502b 100644 (file)
 #include <asm/pgtable.h>
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include <asm/mach/dma.h>
 
index cd51520b1e31d35713dea90f5270ba30f9928748..24df2a349a986a5afd4ec18a3dc4dabe0f23f37a 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <asm/types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 #include "common.h"
index 22573fcf9e13ef6c1372e9db3193c0fbfdedb5cb..53e1f62f2e7916ffacd533f149b79aa868d6dfdf 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <asm/types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 #include <linux/device.h>
index 899f9350cc653b84cdf637baf4fa00a922a82deb..78be457dc32431cc7e2c1a351a22286eb32d6669 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "common.h"
 
 MACHINE_START(H7201, "Hynix GMS30C7201")
index eb725bd8e8370894f0dc7c511fad6922c0b70c6b..56161d55cf47e4ea4c6b3cd7743cf008f7eab566 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "common.h"
 
 static struct resource cirrus_resources[] = {
similarity index 96%
rename from include/asm-arm/arch-h720x/boards.h
rename to arch/arm/mach-h720x/include/mach/boards.h
index 8021f81f0742bb744a3ed0bc5f8fd125ddea0a93..079b279e1242f8f681c0a0d7995cbe3d4cd1602c 100644 (file)
@@ -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>
similarity index 95%
rename from include/asm-arm/arch-h720x/debug-macro.S
rename to arch/arm/mach-h720x/include/mach/debug-macro.S
index 82822d362733cfcef82e09be844160073a3598a5..6294a1344dda80f81d89a1191f4a733ef4095f0f 100644 (file)
@@ -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
  *
similarity index 92%
rename from include/asm-arm/arch-h720x/dma.h
rename to arch/arm/mach-h720x/include/mach/dma.h
index bfc6636679f72b8b1ccee4febf30c5d9f5774fe6..0a9d86ee84fe6cebcf5c189cee09b1179ac98a2f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-h720x/dma.h
+ * arch/arm/mach-h720x/include/mach/dma.h
  *
  * Architecture DMA routes
  *
similarity index 97%
rename from include/asm-arm/arch-h720x/entry-macro.S
rename to arch/arm/mach-h720x/include/mach/entry-macro.S
index 38dd63ae104ea4c3c78f3f60fb645b477fb38cda..6d3b917c4a18e7cbd9f441d9e73d4a904f4b16e5 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-h720x/h7201-regs.h
rename to arch/arm/mach-h720x/include/mach/h7201-regs.h
index 49d4f6bd30806ef8ecc8633180e0f735f00b1c7c..611b4947ccfc54c3251a34f00d305934dc09c7c7 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-h720x/h7202-regs.h
rename to arch/arm/mach-h720x/include/mach/h7202-regs.h
index 43d8ba8a6013ca07c8b855c594166c01d03d6687..17c12eb349957d37bbba2330a839c2bd4b2121e3 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-h720x/hardware.h
rename to arch/arm/mach-h720x/include/mach/hardware.h
index dfb778906a9f10af5942ff310db57a86362e9ff7..6c19156e2a429d493f0757f244616d031cf11917 100644 (file)
@@ -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>
similarity index 74%
rename from include/asm-arm/arch-h720x/io.h
rename to arch/arm/mach-h720x/include/mach/io.h
index 68814828c9a74f24cf752ac3064663cb8e5569c7..1dab74ce88c6b831b8586728e9707616e0c770fe 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-h720x/irqs.h
rename to arch/arm/mach-h720x/include/mach/irqs.h
index 8244413988be67ffa7a73d78e9a2758539de7d99..430a92b492f15cc125a827d9a833a7e5efe8bfc1 100644 (file)
@@ -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>
similarity index 93%
rename from include/asm-arm/arch-h720x/memory.h
rename to arch/arm/mach-h720x/include/mach/memory.h
index 53e923dba76e658b4d4613e8099ae424c2ce2854..cb26f49cc4e183930c08b7f8941d5ab857c79c56 100644 (file)
@@ -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
  *
similarity index 82%
rename from include/asm-arm/arch-h720x/system.h
rename to arch/arm/mach-h720x/include/mach/system.h
index ddba93760b4205d8ae81ae09af41e6c306615130..e4a7c760d52a584f4321d233beaa523163cd8dd4 100644 (file)
@@ -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)
 {
similarity index 88%
rename from include/asm-arm/arch-h720x/timex.h
rename to arch/arm/mach-h720x/include/mach/timex.h
index 48a391c4080faef30b109e3295c0c3a8e75180b0..3f2f447ff36b2ac1ec6dcf2abffd1a63134900e5 100644 (file)
@@ -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
similarity index 86%
rename from include/asm-arm/arch-h720x/uncompress.h
rename to arch/arm/mach-h720x/include/mach/uncompress.h
index 61584cd5f42535cc876c46a680d9f179b95533e4..d6623234f61e3ed04c4910438be810cb045fa2df 100644 (file)
@@ -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
similarity index 73%
rename from include/asm-arm/arch-h720x/vmalloc.h
rename to arch/arm/mach-h720x/include/mach/vmalloc.h
index b4693cb821ef6747c5f13eff12681705f8c73f86..ff1460d6841ba9c76f85e54d11d0709c4de801a3 100644 (file)
@@ -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
index 8915a5fc63cdcc81e8c8b2213d2d2497c1be2001..4b4230db37653ab3e1d6c3368490ee2014de48cd 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/err.h>
 
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 /*
  * Very simple approach: We can't disable clocks, so we do
index 3fee1ac6fd8c3f86519076ace41d6c1d1754db0d..434b4ca0af6771c47aeabee4c3d1c19eb8003841 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/err.h>
 #include <asm/system.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "generic.h"
 
index 17a43ba1696bd8fb1151135813cc8b6909825ee4..c10810c936b373525c24f836c67c7dc3b07cdaec 100644 (file)
@@ -30,9 +30,9 @@
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
-#include <asm/arch/imx-dma.h>
+#include <mach/imx-dma.h>
 
 struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS];
 
index df77665fadceebc71366dadba27700d37adc437b..fa72174dd95ce6c08797beca119f624a7cd6c91a 100644 (file)
 #include <linux/string.h>
 
 #include <asm/errno.h>
-#include <asm/arch/imxfb.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imxfb.h>
+#include <mach/hardware.h>
+#include <mach/imx-regs.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/gpio.h>
+#include <mach/mmc.h>
+#include <mach/gpio.h>
 
 unsigned long imx_gpio_alloc_map[(GPIO_PORT_MAX + 1) * 32 / BITS_PER_LONG];
 
similarity index 94%
rename from include/asm-arm/arch-imx/debug-macro.S
rename to arch/arm/mach-imx/include/mach/debug-macro.S
index c611871643a287ea08f1a37a151f765329d35b6b..87802bbfe6330d348baa5c97b3ab1fcefb498bbe 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-imx/entry-macro.S
rename to arch/arm/mach-imx/include/mach/entry-macro.S
index 5dc0f307c1bbbdd539f8ea5490d23923081cb940..e4db679f7766668caf2b9f7084886bf9060c111d 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-imx/gpio.h
rename to arch/arm/mach-imx/include/mach/gpio.h
index 486023263f329d9fd4213ba06f25a60d5f77a991..6e3d795f22642c3d4301dba5f185ce6d968589bd 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-imx/hardware.h
rename to arch/arm/mach-imx/include/mach/hardware.h
index 6542ca5e8c33f8e41ee93e8e182d295159b81bbb..c73e9e724c75fe992b9a71df7349350ba5ddf504 100644 (file)
@@ -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.
  *
similarity index 92%
rename from include/asm-arm/arch-imx/io.h
rename to arch/arm/mach-imx/include/mach/io.h
index 1a1d9bb886316a740abd9f7edc76caac5b42da76..c50c5fa6fb814e0419995726565ed474a9399a95 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-imx/irqs.h
rename to arch/arm/mach-imx/include/mach/irqs.h
index 238197cfb9d964a378a7e4602ff90d1970d88240..eb8d5bd05d56d1dafea077a21be6f77d38dd80be 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-imx/memory.h
rename to arch/arm/mach-imx/include/mach/memory.h
index 5ad90127915f63cfc69f2629ebb0772ff4280f55..5c453063c0eddfb58b4a9fb1dcff579a85ecb3b6 100644 (file)
@@ -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)
similarity index 96%
rename from include/asm-arm/arch-imx/mx1ads.h
rename to arch/arm/mach-imx/include/mach/mx1ads.h
index d90fa4b49ce19e4d7cc14da78e75fd7916fbe0db..def05d510eb32475df62cf7f13b16601b7eee8ec 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-imx/spi_imx.h
rename to arch/arm/mach-imx/include/mach/spi_imx.h
index 2165449e976e315b1aadf241e063d7725071b350..4186430feecfa0230d6d0c0e23444841b6fab112 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-imx/system.h
rename to arch/arm/mach-imx/include/mach/system.h
index c645fe9afb9dc165e556bb3a67f9cfec992c9dba..adee7e51bab2b8bbdce427150465ea30f26591fc 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-imx/uncompress.h
rename to arch/arm/mach-imx/include/mach/uncompress.h
index da333f69136f599cd7c0bd2645d654bd06dafd29..70523e67a8f6964f5fb4c01d98acc407719a1246 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-imxads/uncompress.h
+ *  arch/arm/mach-imxads/include/mach/uncompress.h
  *
  *
  *
similarity index 94%
rename from include/asm-arm/arch-imx/vmalloc.h
rename to arch/arm/mach-imx/include/mach/vmalloc.h
index cb6169127068fd26a6c56660c360b030cacbf54c..7d7cb0bde3e8da41b3b1aba30fb55580c400c61e 100644 (file)
@@ -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.
  *
index 167b7fcbed2fab70f382c76e17c667ba72f8c5e6..798f221eb3b7033e4f2aab147e8797fe270e944f 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
index 8757d37354f2f2add5faa165efdee794cc732c02..af81621f689bbe5992ba0e7ce77b9cbc1fd27cdc 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/leds.h>
index baf5e2f711eebd9802eec50cad77d14984cde8f9..87fa1ff43b0bf334e05189f9e0ee15bd3a18637e 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -25,8 +25,8 @@
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/imx-uart.h>
+#include <mach/mmc.h>
+#include <mach/imx-uart.h>
 #include <linux/interrupt.h>
 #include "generic.h"
 
index 7fc6d2cdfd99b8ef2a6e28aecb257912e833fde9..08be3875c59ea8d741ddf072169a2ec8444f58f2 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/clockchips.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
index f439bf12be5ee6e001adfef6bac55343ecc2e120..8bacf6d4d0974eb4a3265e8ebab0ee11529d3022 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/arm_timer.h>
-#include <asm/arch/cm.h>
+#include <mach/cm.h>
 #include <asm/system.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>
index afa0f21ea96e553ecfb2f62a80ecc034321085f9..ce5ea7c266751d35096b51a283d36de58f7cc69f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/smp.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/icst525.h>
index 5a1588cf8242a2cea12e98bef963eb2dc065ad53..0a7b3267c8d8302c3cf84e4392d23d87020444f1 100644 (file)
@@ -23,8 +23,8 @@
 
 #include <asm/io.h>
 #include <asm/hardware/icst525.h>
-#include <asm/arch/lm.h>
-#include <asm/arch/impd1.h>
+#include <mach/lm.h>
+#include <mach/impd1.h>
 #include <asm/sizes.h>
 
 #include "clock.h"
similarity index 91%
rename from include/asm-arm/arch-integrator/debug-macro.S
rename to arch/arm/mach-integrator/include/mach/debug-macro.S
index 85b327c352df0835203b47ebc16b78e4e907ded6..d347d659ea308c74edc6aa5870aae9b05e5f85d2 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-integrator/dma.h
rename to arch/arm/mach-integrator/include/mach/dma.h
index 83fd6bbaf9d3f959c4db886170c507a6f659757e..fbebe85a2db7ca20cbfac8e2ea821dde6929edf6 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-integrator/entry-macro.S
rename to arch/arm/mach-integrator/include/mach/entry-macro.S
index ef535a68bdd30da9199d26070cdd86c86a62a9e4..7649c57acb536663698ffe69cdadb302f8fd4ed7 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-integrator/hardware.h
rename to arch/arm/mach-integrator/include/mach/hardware.h
index 6f0947bc500d1de07e441afebece4f86dfd9b201..1251319ef9ae46b370e2c272692cf6ee15f8e5c1 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-integrator/io.h
rename to arch/arm/mach-integrator/include/mach/io.h
index c8f2175948bd8d1a6e10e65790a5cd2b865e2de4..f21bb5493dd99ad293bddf5326fc4469dc930524 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-integrator/irqs.h
rename to arch/arm/mach-integrator/include/mach/irqs.h
index ba7b3afee4453685a4e38e6faacc799716c38ca1..1fbe6d1902226a0d19bc796ef9048720a2853c9b 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-integrator/memory.h
rename to arch/arm/mach-integrator/include/mach/memory.h
index 1ab56d783e7c4eb5b41404f6423a653af0fc070b..be7e63c21d257d018b7227349ee837c490cf192e 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-integrator/system.h
rename to arch/arm/mach-integrator/include/mach/system.h
index 8ea442237d20b205c6a79f2c0fc9d495bb26d4bd..c485345c8c779bc5ab914f3ffbed7d4ca1608d54 100644 (file)
@@ -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)
 {
similarity index 94%
rename from include/asm-arm/arch-integrator/timex.h
rename to arch/arm/mach-integrator/include/mach/timex.h
index 87a762818ba209c1222e2a2f1334dc66736fd161..1dcb42028c829341bc93b5e94d1999bc673eeade 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-integrator/timex.h
+ *  arch/arm/mach-integrator/include/mach/timex.h
  *
  *  Integrator architecture timex specifications
  *
similarity index 96%
rename from include/asm-arm/arch-integrator/uncompress.h
rename to arch/arm/mach-integrator/include/mach/uncompress.h
index f61825c4d9018d5011653790ca978461f2899536..30452f00a164fbd9c48135bb796edf37c47f6b95 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-integrator/vmalloc.h
rename to arch/arm/mach-integrator/include/mach/vmalloc.h
index 170cccece523769ef5e34d760ef9c283fce8f7b1..e87ab0b37bddb353810f97bd25461a536cf167c1 100644 (file)
@@ -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.
  *
index 3996ddc2a4b1f42a9b19d8afa4de4dc2a1dd250c..6e472b5f8f26b73a38837c0d31134d29b48b3d19 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/amba/kmi.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
 #include <asm/param.h>         /* HZ */
 #include <asm/mach-types.h>
 
-#include <asm/arch/lm.h>
+#include <mach/lm.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
index 28d330101e6f0af17188858080e1420a14c0a21f..6b99e9c258bdcc71ae47d9b928d6ff83c1bccfa8 100644 (file)
 #include <linux/amba/kmi.h>
 #include <linux/amba/clcd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/icst525.h>
 
-#include <asm/arch/cm.h>
-#include <asm/arch/lm.h>
+#include <mach/cm.h>
+#include <mach/lm.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
index 6062180b108b8c043b4cf2eee6d65510360b8df3..7bc6881434ecf4bfd9d21c35db216a9fef548ed8 100644 (file)
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
-#include <asm/arch/cm.h>
+#include <mach/cm.h>
 
 static int saved_leds;
 
index f939c50914054081407848ecd351f2c509839fe9..f52c7af31eaaac41d31bf1fd7c4cc0d9b9f43572 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/slab.h>
 
-#include <asm/arch/lm.h>
+#include <mach/lm.h>
 
 #define to_lm_device(d)        container_of(d, struct lm_device, dev)
 #define to_lm_driver(d)        container_of(d, struct lm_driver, drv)
index b8685d919fee9eb6ba55e177fe3ba580930d210f..9f2b1ea8fb209f27ce6058f4d005fef1db14d983 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
similarity index 99%
rename from include/asm-arm/arch-iop13xx/adma.h
rename to arch/arm/mach-iop13xx/include/mach/adma.h
index 26f60af67168a58f25347a61af1e5cc8bef90b9a..60019c8e6465f420be5d958ca7dd7432f4bc205d 100644 (file)
@@ -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)
similarity index 92%
rename from include/asm-arm/arch-iop13xx/debug-macro.S
rename to arch/arm/mach-iop13xx/include/mach/debug-macro.S
index 788b4e386c16fc3d61a8fa51e3c42b275aec2d31..9037d2e8557cbb163a07d2b47cbe967f959cf4fb 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-iop13xx/memory.h
rename to arch/arm/mach-iop13xx/include/mach/memory.h
index 031a0fa78efff1d96e28e1fa0f93f3e51689cdb4..e8b59d8f1bb985f1e4fde351e677f48e4688f679 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-iop13xx/pci.h
rename to arch/arm/mach-iop13xx/include/mach/pci.h
index 4041f30d4cd38f3e6eab3c651a5778a25df175e2..17b5515af8b1c6a73f064aef27b6fdd83fd794a3 100644 (file)
@@ -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;
similarity index 87%
rename from include/asm-arm/arch-iop13xx/system.h
rename to arch/arm/mach-iop13xx/include/mach/system.h
index 8575af8db78c7cf3b2c71b92a111133bb19663ca..c7127f416e1fd01d4c92d57b1fa09476f910ecd7 100644 (file)
@@ -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();
similarity index 53%
rename from include/asm-arm/arch-iop13xx/timex.h
rename to arch/arm/mach-iop13xx/include/mach/timex.h
index 47564ecb387229179898dc69aec4c57de48b1c5f..5b1f1c8a82702a20002a4f8890c1ccff6daa57b9 100644 (file)
@@ -1,3 +1,3 @@
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define CLOCK_TICK_RATE (100 * HZ)
similarity index 92%
rename from include/asm-arm/arch-iop13xx/uncompress.h
rename to arch/arm/mach-iop13xx/include/mach/uncompress.h
index 5d4418decb86e031ab34330ccc125faf62732612..fa4f80522fadd3f1db5b9acd988fae2f5baf291b 100644 (file)
@@ -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)
index 44b8c8c1410598bbf2b3f708f7f335bd35e427c0..26cfa318142cdefe5d0bb5a529041eddaef075cb 100644 (file)
@@ -18,7 +18,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 void * __iomem __iop13xx_io(unsigned long io_addr)
index e17457e8e919ce03371cdc095d1188d503b54802..5051c03d437c883f167eeb5f930137d7e82454dd 100644 (file)
  */
 #include <linux/pci.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/pci.h>
+#include <mach/pci.h>
 #include <asm/mach/time.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */
 
index 19204d8f81096c31afc32852f35cd09d8af26f72..bc443073a8e387a19253d6375d635044dc32516b 100644 (file)
  */
 #include <linux/pci.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/pci.h>
+#include <mach/pci.h>
 #include <asm/mach/time.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 extern int init_atu;
 
index e860a6d22dee457690a862c4cfddd6710e6a2bce..0d099ca87bdf0fbce484cb506c1ba26423bc75db 100644 (file)
@@ -23,9 +23,9 @@
 #include <asm/uaccess.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/msi.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/msi.h>
 
 /* INTCTL0 CP6 R0 Page 4
  */
index a0e0147f24f849fd2c53d435984395d7b51998bb..673b0db220348398bf74aa5989c292f1ef0b061c 100644 (file)
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/sizes.h>
 #include <asm/signal.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/pci.h>
+#include <mach/pci.h>
 
 #define IOP13XX_PCI_DEBUG 0
 #define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x)))
index d3fee8a11b6213ed1bc9aa91336f949cf48555bf..b17ccc8cb471f206ac8044f614d5df8be19e3c71 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/mtd/physmap.h>
 #endif
 #include <asm/mach/map.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/iop_adma.h>
index 9941395a5d00ef73ce3657192998148b086cd1aa..3ad4696ade42dbed70dcffe1421d51248a3f40b1 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <asm/mach/arch.h>
@@ -31,7 +31,7 @@
 #include <asm/mach/pci.h>
 #include <asm/mach/time.h>
 #include <asm/mach-types.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 static void __init em7210_timer_init(void)
 {
index 8761445ed040b6a17c90a6634a99dc6737edef37..45d61276d2332acb6b312157a07248e69afac0a8 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -34,7 +34,7 @@
 #include <asm/mach/time.h>
 #include <asm/mach-types.h>
 #include <asm/page.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * GLAN Tank timer tick configuration.
similarity index 91%
rename from include/asm-arm/arch-iop32x/debug-macro.S
rename to arch/arm/mach-iop32x/include/mach/debug-macro.S
index 9022b6849e23b7043b316e353d3c06525924ab11..58b01664ffba5edc93f81e002bc79259f418b374 100644 (file)
@@ -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
  *
similarity index 84%
rename from include/asm-arm/arch-iop33x/dma.h
rename to arch/arm/mach-iop32x/include/mach/dma.h
index b7775fdc5ad36fc8d3842af725c8eb2e0e32ccff..f8bd817f205d079d49419413a47263b285eca26e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop33x/dma.h
+ * arch/arm/mach-iop32x/include/mach/dma.h
  *
  * Copyright (C) 2004 Intel Corp.
  *
similarity index 92%
rename from include/asm-arm/arch-iop32x/entry-macro.S
rename to arch/arm/mach-iop32x/include/mach/entry-macro.S
index 207db99dfbd2130f655235cc86d447817dd2216a..b02fb56bafccee9fb1ad2091687f4fe7f92f8d1c 100644 (file)
@@ -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
similarity index 75%
rename from include/asm-arm/arch-iop32x/glantank.h
rename to arch/arm/mach-iop32x/include/mach/glantank.h
index bf0665acc1c13bb47b9a3b18e326a20210281169..958eb91c09137c21a09346bcac2e3439452e7600 100644 (file)
@@ -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
  */
similarity index 94%
rename from include/asm-arm/arch-iop32x/hardware.h
rename to arch/arm/mach-iop32x/include/mach/hardware.h
index 6556ed5eee31c406d11960c75b11cfd68126493b..d559c4e6095a5420cc7d7f6fbca9393fa3b91d25 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/hardware.h
+ * arch/arm/mach-iop32x/include/mach/hardware.h
  */
 
 #ifndef __HARDWARE_H
similarity index 90%
rename from include/asm-arm/arch-iop32x/io.h
rename to arch/arm/mach-iop32x/include/mach/io.h
index 47b2736236e4f7b773480f7558eecb93960f508d..ce54705ba3d41489675b4be47efcc2363623eb76 100644 (file)
@@ -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);
similarity index 95%
rename from include/asm-arm/arch-iop32x/iop32x.h
rename to arch/arm/mach-iop32x/include/mach/iop32x.h
index 0d8af57221a12f8972af6ecc0bd498dac801a53e..abd9eb49f1033773dd0ca92cb02b7ce51842cda6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/iop32x.h
+ * arch/arm/mach-iop32x/include/mach/iop32x.h
  *
  * Intel IOP32X Chip definitions
  *
similarity index 89%
rename from include/asm-arm/arch-iop32x/iq31244.h
rename to arch/arm/mach-iop32x/include/mach/iq31244.h
index fff4eafa1f6b075e3df5c784a4976cc432013f19..6b6b369e781c5488f6427db0f93d3f96058d2c5f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/iq31244.h
+ * arch/arm/mach-iop32x/include/mach/iq31244.h
  *
  * Intel IQ31244 evaluation board registers
  */
similarity index 89%
rename from include/asm-arm/arch-iop32x/iq80321.h
rename to arch/arm/mach-iop32x/include/mach/iq80321.h
index eb69db9b9a06e1eca64c883b4a4a459ab96599ef..498819b737e704f074007c31d9e551fb2578d46b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/iq80321.h
+ * arch/arm/mach-iop32x/include/mach/iq80321.h
  *
  * Intel IQ80321 evaluation board registers
  */
similarity index 96%
rename from include/asm-arm/arch-iop32x/irqs.h
rename to arch/arm/mach-iop32x/include/mach/irqs.h
index bbaef873afcea438d595148fb738697c4156b370..33573e09914ce8e888224a2fe965a405f617ef13 100644 (file)
@@ -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
similarity index 87%
rename from include/asm-arm/arch-iop32x/memory.h
rename to arch/arm/mach-iop32x/include/mach/memory.h
index bdcf03895ee0445e4be30466bfe32e479e41b7a8..42cd4bf3148cba2a05b9da2dcd5cd1d97b9d9df2 100644 (file)
@@ -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.
similarity index 89%
rename from include/asm-arm/arch-iop32x/n2100.h
rename to arch/arm/mach-iop32x/include/mach/n2100.h
index 77a8af47662975dedf99c486f41ae0cc66d939ca..40b8a532b064c9c3cdf8ceb757fd5318423fe428 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/n2100.h
+ * arch/arm/mach-iop32x/include/mach/n2100.h
  *
  * Thecus N2100 board registers
  */
similarity index 93%
rename from include/asm-arm/arch-iop32x/system.h
rename to arch/arm/mach-iop32x/include/mach/system.h
index 17b7eb7e9c0d523cdcb4a70d5dc3d63b70bdf451..20f923e54f4601cc470dfeccd3275291db718ffa 100644 (file)
@@ -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.
  *
similarity index 56%
rename from include/asm-arm/arch-iop32x/timex.h
rename to arch/arm/mach-iop32x/include/mach/timex.h
index 445704619825c59504fff90a3d8c27dcc7470c56..a541afced3cb39a36df45c97d66e0a49942d9b8f 100644 (file)
@@ -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)
similarity index 90%
rename from include/asm-arm/arch-iop32x/uncompress.h
rename to arch/arm/mach-iop32x/include/mach/uncompress.h
index 07028786394e8260f0e3c0e41ef7a8e618242a5c..b247551b6f5a35d65a0efe2bd29d7a7cb981eec4 100644 (file)
@@ -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/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..85ceb09
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-iop32x/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe000000
index 5a4e951cad9ecff6c205a2c504244c42be4cd592..082818aaa2056fe8cd0ee452d0f75f03ca4d2965 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -36,7 +36,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * Until March of 2007 iq31244 platforms and ep80219 platforms shared the
index 1c098c507c665e28efdcc248b977ca422df030ab..d735539808b4ab2f891bb909e98f3ee0a35059f8 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -33,7 +33,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * IQ80321 timer tick configuration.
index 2ea1e716296fba89e4d6e68a91f52aff3122a254..ba59b2d17db155e84e77997e59cebd38f8e4dd3c 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/list.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 static u32 iop32x_mask;
index f38dc19bbcc97d93e9ac4e3ebde03b922c5bc62a..3173f9c5835d948ff884e7ae0ff2362579d35036 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -40,7 +40,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * N2100 timer tick configuration.
similarity index 92%
rename from include/asm-arm/arch-iop33x/debug-macro.S
rename to arch/arm/mach-iop33x/include/mach/debug-macro.S
index 9e7132ebe6a7898eed7af6592b68e3c988dfc2d3..a60c9ef05cc3cf16d3097ec94f1789b9e3097f7f 100644 (file)
@@ -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
  *
similarity index 84%
rename from include/asm-arm/arch-iop32x/dma.h
rename to arch/arm/mach-iop33x/include/mach/dma.h
index e977a9ef3160490dd11cb0034f02a9733aa94da5..d8b42232931d4d2a71c999a26b0a3cbdf5f6d225 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop32x/dma.h
+ * arch/arm/mach-iop33x/include/mach/dma.h
  *
  * Copyright (C) 2004 Intel Corp.
  *
similarity index 92%
rename from include/asm-arm/arch-iop33x/entry-macro.S
rename to arch/arm/mach-iop33x/include/mach/entry-macro.S
index b8e3d449e88276fb271430cd7315b8848417e2be..4e1f7282b354042845d770a67fbc6b2cbde92d79 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-iop33x/hardware.h
rename to arch/arm/mach-iop33x/include/mach/hardware.h
index 0659cf94d040dd9ff6fdbad9658aa076df4f1172..8c10e430655eac72ca1ddfeb94c27fc7ac92dbf8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop33x/hardware.h
+ * arch/arm/mach-iop33x/include/mach/hardware.h
  */
 
 #ifndef __HARDWARE_H
similarity index 90%
rename from include/asm-arm/arch-iop33x/io.h
rename to arch/arm/mach-iop33x/include/mach/io.h
index 3fc607c46f0300f6664361ead02a0a217838dea6..158874631217b0d7687c566de199ef9ddcce89ca 100644 (file)
@@ -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);
similarity index 96%
rename from include/asm-arm/arch-iop33x/iop33x.h
rename to arch/arm/mach-iop33x/include/mach/iop33x.h
index 766985b9a723c6064f56c9df85f4d2d52958110e..24567316ec88cc01646f61422b9bb47d2820dc57 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop33x/iop33x.h
+ * arch/arm/mach-iop33x/include/mach/iop33x.h
  *
  * Intel IOP33X Chip definitions
  *
similarity index 87%
rename from include/asm-arm/arch-iop33x/iq80331.h
rename to arch/arm/mach-iop33x/include/mach/iq80331.h
index 79b9302017eaf6d6b96c182abf3e866156c9c4f9..fe406b0127f7054be2e36e443bb3996885ea946d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop33x/iq80331.h
+ * arch/arm/mach-iop33x/include/mach/iq80331.h
  *
  * Intel IQ80331 evaluation board registers
  */
similarity index 87%
rename from include/asm-arm/arch-iop33x/iq80332.h
rename to arch/arm/mach-iop33x/include/mach/iq80332.h
index 0531656294922532ae82c61dbd6d8d141ebffa25..8325d71f2ed5bf3a0ba541f63985c9d0cfcbf38e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-iop33x/iq80332.h
+ * arch/arm/mach-iop33x/include/mach/iq80332.h
  *
  * Intel IQ80332 evaluation board registers
  */
similarity index 97%
rename from include/asm-arm/arch-iop33x/irqs.h
rename to arch/arm/mach-iop33x/include/mach/irqs.h
index d045f840339669dbe2f52e7ff210a9115d87d91d..707628a600ac7db34841f3dec30acfc68dce133b 100644 (file)
@@ -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.
similarity index 87%
rename from include/asm-arm/arch-iop33x/memory.h
rename to arch/arm/mach-iop33x/include/mach/memory.h
index d798d83c83a5591edb9caf7e8a64801c94869de7..2cef0bbb354f84aa220b82382e49acdb50a251a5 100644 (file)
@@ -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.
similarity index 90%
rename from include/asm-arm/arch-iop33x/system.h
rename to arch/arm/mach-iop33x/include/mach/system.h
index 00dd07ece262f7675f4490fdc587e2266b2d02a4..7bf3bfb49446404afe2c684e92b1afbf60b8e002 100644 (file)
@@ -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.
  *
similarity index 56%
rename from include/asm-arm/arch-iop33x/timex.h
rename to arch/arm/mach-iop33x/include/mach/timex.h
index 75a001e93daf070e76f5eabc386bdefc0427779a..c75760844d49eae5b509d6d9170918d79e3571fe 100644 (file)
@@ -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)
similarity index 89%
rename from include/asm-arm/arch-iop33x/uncompress.h
rename to arch/arm/mach-iop33x/include/mach/uncompress.h
index 34d9e8e8287ae0c88ba28ffb757ab38c57156460..b42423f633026e0bcb3aff56db8ed87984a51175 100644 (file)
@@ -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/arch/arm/mach-iop33x/include/mach/vmalloc.h b/arch/arm/mach-iop33x/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..f9f99de
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-iop33x/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe000000
index e736c50ed3dc37e16fa4873a308b1e76b156a2a3..c7d99f9fafed254c9e3d640375dbbeccf2cad246 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * IQ80331 timer tick configuration.
index 75347a23ceb11bb6ec7acb4d34c537af4aaf4a8c..af616c5f4fb26f6e476799fc37c0d2b4c7cba987 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 /*
  * IQ80332 timer tick configuration.
index 6ae1fac6c61a73f7fd5ebeff2c0cdcef1b7730e1..abb4ea2ed4fd483a2cea4095d1bdc04fce3be14c 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/list.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 static u32 iop33x_mask0;
index f11b86fc86c1305355bfec106c536fcefa3ac330..8c21870fa8082c2f0ebd60bc551110758dd6855d 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iop3xx.h>
 #include <asm/mach/arch.h>
 
index 7e810b3fa5524c1991fafbb863b23caebcd0523d..a6a4f93085fd8041017b34e5da2c309e3b87a66c 100644 (file)
@@ -29,7 +29,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
@@ -39,7 +39,7 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 static DEFINE_SPINLOCK(ixp2000_slowport_lock);
 static unsigned long ixp2000_slowport_irq_flags;
index 17af9f7bd06607f0f14214d2503818d54275dd50..c62ed655c1a781dc2e6e40c17a2737644bb8ccb5 100644 (file)
@@ -38,7 +38,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/pci.h>
similarity index 92%
rename from include/asm-arm/arch-ixp2000/debug-macro.S
rename to arch/arm/mach-ixp2000/include/mach/debug-macro.S
index bc8b39654793f63b333b249d4ace8de9b16825d0..904ff56d2246e9c91671b09dfdcee60598504f58 100644 (file)
@@ -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
  *
similarity index 84%
rename from include/asm-arm/arch-ixp2000/dma.h
rename to arch/arm/mach-ixp2000/include/mach/dma.h
index 548d8dc507eb6d6e03f2a4de200d0aa1a36f0922..26063d60f622c64360ec22b0d62adfdaf0810813 100644 (file)
@@ -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.
  *
similarity index 96%
rename from include/asm-arm/arch-ixp2000/enp2611.h
rename to arch/arm/mach-ixp2000/include/mach/enp2611.h
index 42f3c28dc5c4e08e712b0272375bd4b309001799..9ce3690061d5680ef152c50125d6c5b5271d0c82 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-ixp2000/entry-macro.S
rename to arch/arm/mach-ixp2000/include/mach/entry-macro.S
index 11d512ad594586274e147cf64d8402ed65336deb..5850ffc8c7512099343b22f5b4ba272243bd6749 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-ixp2000/gpio.h
rename to arch/arm/mach-ixp2000/include/mach/gpio.h
index 03cbbe1fd9d8fe0f47874af3f9e43ffc935feb7a..4a88d2c33dacb6a4640b998c824465c9561d3e23 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp2000/gpio.h
+ * arch/arm/mach-ixp2000/include/mach/gpio.h
  *
  * Copyright (C) 2002 Intel Corporation.
  *
similarity index 95%
rename from include/asm-arm/arch-ixp2000/hardware.h
rename to arch/arm/mach-ixp2000/include/mach/hardware.h
index e7ea781c48aa27591e293a3e22c7ce46085e7c88..f033de4e74935ab0abeeec9c84b64a1274ca92f9 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-ixp2000/io.h
rename to arch/arm/mach-ixp2000/include/mach/io.h
index 5dc1d25dcb4f9f3c12d1f85411f46535ca0cc6ed..859e584914d98072c7b06870be2ec8f914d29392 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-ixp2000/irqs.h
rename to arch/arm/mach-ixp2000/include/mach/irqs.h
index 62f09c7ff420243a5b651ee565f48d51a2b9d405..bee96bcafdca103572fabdf9e5b14d762991ceb8 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-ixp2000/ixdp2x00.h
rename to arch/arm/mach-ixp2000/include/mach/ixdp2x00.h
index 546e2e8e27b890b17f8a27e7519c8ff3c47f2e68..5df8479d9481c2371edd511ad009049e67dfdb78 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-ixp2000/ixdp2x01.h
rename to arch/arm/mach-ixp2000/include/mach/ixdp2x01.h
index c6d51426e98f0014939256df8e0f15be1dffc707..4c1f04083e54a3a710e909533bff7fce589284b6 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-ixp2000/ixp2000-regs.h
rename to arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h
index ccae4bec92c58337b05c535ee17c2bd94b66d3f2..19d80379a3e308d4d154028800f0501084aad37a 100644 (file)
@@ -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.
  *
similarity index 91%
rename from include/asm-arm/arch-ixp2000/memory.h
rename to arch/arm/mach-ixp2000/include/mach/memory.h
index 21e1de51e3f67b5114639649f06fad16e31e5d6c..241529a7c52d0806cf89acdfd3613716bc52ced5 100644 (file)
@@ -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)))
similarity index 98%
rename from include/asm-arm/arch-ixp2000/platform.h
rename to arch/arm/mach-ixp2000/include/mach/platform.h
index a66317ab2071f35d8fabce13ce2948cd20ae2985..42182c79ed9070915673eae713fadde4c9bb9127 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-ixp2000/system.h
rename to arch/arm/mach-ixp2000/include/mach/system.h
index 8731dd36e4520b87522d6e8cf610118f06397216..2e9c68f95a24bf13b76623632d9946aeb36122d7 100644 (file)
@@ -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)
similarity index 78%
rename from include/asm-arm/arch-ixp2000/timex.h
rename to arch/arm/mach-ixp2000/include/mach/timex.h
index b78a183d46985b8545d35172d9c8545180fe2aef..835e659f93d460fccbd1e09fa6c0bb9bd2b9cd2d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ixp2000/timex.h
+ * arch/arm/mach-ixp2000/include/mach/timex.h
  *
  * IXP2000 architecture timex specifications
  */
similarity index 96%
rename from include/asm-arm/arch-ixp2000/uncompress.h
rename to arch/arm/mach-ixp2000/include/mach/uncompress.h
index f66b408f363ebbe9b9761f8ea97fed85b40b628e..ce363087df78e4487b0f981e375b7534f6129a0e 100644 (file)
@@ -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>
similarity index 94%
rename from include/asm-arm/arch-ixp2000/vmalloc.h
rename to arch/arm/mach-ixp2000/include/mach/vmalloc.h
index 275136963a0ccfbe1a0385a3809370c5494f5d26..d195e35aed3bfe88a40ba18c9591433e63454883 100644 (file)
@@ -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>
  *
index 5f1068762979b3d2432a440f01992cc24e0c615f..c673b9ef9f69e071beebf04fa089325d035f1428 100644 (file)
@@ -31,7 +31,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/pci.h>
index 4c0f0ee63407e2b590caa3c050a1c1879ffe3a19..6715b50829a605c7f1ca09830ace1e75c9705538 100644 (file)
@@ -31,7 +31,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/pci.h>
index f378baed267f2a6c595e86b62c45c71e40ad023d..5a781fd9757a1089c829cad9b1c5da3300de15fc 100644 (file)
@@ -31,7 +31,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/pci.h>
@@ -41,7 +41,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/arch.h>
 
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 
 /*************************************************************************
index 739a9e0965c65bde2318d8160497520ebd47e061..78a2341dee2c31fff2495d7dd7b1e1f361b22af9 100644 (file)
@@ -36,7 +36,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/pci.h>
index dd0eee2c4ccfbe97e25f308e3b79b1cda290d6bc..03d916fbe531efbdbe613736f9b1620f04d4f112 100644 (file)
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/pci.h>
 
index bc40cd49462dbb588d70d9724c25f72fe4df8e2f..68b4ac5b24815ec5767c98bf9f93b42cd2e6110e 100644 (file)
@@ -32,7 +32,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
index b6cbefce7c18ea46d4bb84cb751e867db7791b31..1c06bfc5a7efc5909fe1dd1897b9bcd285388ad0 100644 (file)
@@ -29,7 +29,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/system.h>
similarity index 88%
rename from include/asm-arm/arch-ixp23xx/debug-macro.S
rename to arch/arm/mach-ixp23xx/include/mach/debug-macro.S
index 2b25e640247d14a55da35c28c3608178da98179d..905db3188724372ea1ff0ed0e5983050d1263fbf 100644 (file)
@@ -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/arch/arm/mach-ixp23xx/include/mach/dma.h b/arch/arm/mach-ixp23xx/include/mach/dma.h
new file mode 100644 (file)
index 0000000..8886544
--- /dev/null
@@ -0,0 +1,3 @@
+/*
+ * arch/arm/mach-ixp23xx/include/mach/dma.h
+ */
similarity index 93%
rename from include/asm-arm/arch-ixp23xx/entry-macro.S
rename to arch/arm/mach-ixp23xx/include/mach/entry-macro.S
index ec9dd6fc2d0f6592d44dcd2f0d96023d2cb7ea2c..3f5338a7bbddef6113e838e707683d806cbe1604 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp23xx/entry-macro.S
+ * arch/arm/mach-ixp23xx/include/mach/entry-macro.S
  */
 
                .macro  disable_fiq
similarity index 93%
rename from include/asm-arm/arch-ixp23xx/hardware.h
rename to arch/arm/mach-ixp23xx/include/mach/hardware.h
index c0010d21a684f3f64a920c5b52acf973c002cd6a..c3192009a886d71239fe0d26df8b43aa201245cb 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-ixp23xx/io.h
rename to arch/arm/mach-ixp23xx/include/mach/io.h
index 66f5bafc315c6153cd94cd4b925d2d89cbfce5e4..305ea1808c714e740f8efae742e07b2da200dea8 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-ixp23xx/irqs.h
rename to arch/arm/mach-ixp23xx/include/mach/irqs.h
index 27c580898958f2ab96551b1417df33ce86f9179a..3af33a04b8a266ff81d42cd482fbcc060445fe4d 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-ixp23xx/ixdp2351.h
rename to arch/arm/mach-ixp23xx/include/mach/ixdp2351.h
index d5e8a43d7bbdf4103f50f7e05608f550710212a5..663951027de575b1216909397ebcf02827bf468d 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-ixp23xx/ixp23xx.h
rename to arch/arm/mach-ixp23xx/include/mach/ixp23xx.h
index 3927b1d61b17dd593ebfd45a6814469c2e820377..6d02481b1d6d6976056a54d2ca21dfb181659422 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp23xx/ixp23xx.h
+ * arch/arm/mach-ixp23xx/include/mach/ixp23xx.h
  *
  * Register definitions for IXP23XX
  *
similarity index 93%
rename from include/asm-arm/arch-ixp23xx/memory.h
rename to arch/arm/mach-ixp23xx/include/mach/memory.h
index c3d906af9fea72fe8251fe650c7be6619d46d0bb..9d40115f7ebeb94eec1a517fcb64709491a16c66 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-ixp23xx/platform.h
rename to arch/arm/mach-ixp23xx/include/mach/platform.h
index db8aa304c93da5a81ac83ca3d167b0cfa177c06d..db9d9416e5e4edd2ca7eaa7b0c6011e1e0f52fc4 100644 (file)
@@ -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.
  *
similarity index 90%
rename from include/asm-arm/arch-ixp23xx/system.h
rename to arch/arm/mach-ixp23xx/include/mach/system.h
index 54e8a51475e6f23af73553abf6f0f9977e6d021d..d57c3fc10f1f205b003fd894ae84c52d750d5e01 100644 (file)
@@ -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/arch/arm/mach-ixp23xx/include/mach/time.h b/arch/arm/mach-ixp23xx/include/mach/time.h
new file mode 100644 (file)
index 0000000..b61dafc
--- /dev/null
@@ -0,0 +1,3 @@
+/*
+ * arch/arm/mach-ixp23xx/include/mach/time.h
+ */
similarity index 65%
rename from include/asm-arm/arch-ixp23xx/timex.h
rename to arch/arm/mach-ixp23xx/include/mach/timex.h
index 516f72fe60827b58447d457ac20aa0899baf5bf8..e341e9cf9c37b57cbeaee5fad14f18ff27107c20 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp23xx/timex.h
+ * arch/arm/mach-ixp23xx/include/mach/timex.h
  *
  * XScale architecture timex specifications
  */
similarity index 89%
rename from include/asm-arm/arch-ixp23xx/uncompress.h
rename to arch/arm/mach-ixp23xx/include/mach/uncompress.h
index 16c1110f2304c1a08d72adcca3cedc90e054f1c5..8b4c358d2c043f34d5cba9d5ef5ea422fcd7178c 100644 (file)
@@ -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)
similarity index 79%
rename from include/asm-arm/arch-ixp23xx/vmalloc.h
rename to arch/arm/mach-ixp23xx/include/mach/vmalloc.h
index 9f256665854160f2d4db2f908957ee84140f4157..dd519f678d10fda041407d400ff5a732e0192ae1 100644 (file)
@@ -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.
  *
index d510160d472203962d1ed6b15dd391df048baf35..b6e0bfa44df93416223b90b1d6bd52112858fa5c 100644 (file)
@@ -34,7 +34,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
index c84cc6b140ac30dd0ba0c3335a85fa0c0e56c991..701d60aa0efd42c6ea88c37bb363d2dab65507da 100644 (file)
@@ -31,7 +31,7 @@
 #include <asm/sizes.h>
 #include <asm/system.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 extern int (*external_fault) (unsigned long, struct pt_regs *);
 
index c461520d79c60539ed9350b43519f8268c3de3cd..6d38d769761c1b727b7a2da2a1b096bc20fe4e76 100644 (file)
@@ -33,7 +33,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/system.h>
index 8d549daba1e9f90be52628d181d347596f7033f6..08d65dcdb5fe237b686963d180128ca7fd32d180 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <asm/mach/pci.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 void __init avila_pci_preinit(void)
index 87e38ca18a278d7863ebe379e32849e97912f84e..797995ce18b9203155febaa89696392d9b981f61 100644 (file)
@@ -23,7 +23,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
index 3b32f7014bf6685d8254c02e6edc0542f37346c0..192538a045753e437df60c3054dd8212ab3257ed 100644 (file)
@@ -32,7 +32,7 @@
 #include <asm/sizes.h>
 #include <asm/system.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 
 /*
index 00cede2b7a42fc54cc588e238198e5ad4a3ccdf3..58bd2842a6f12f516ec9b5e340335a2620e342b3 100644 (file)
@@ -29,8 +29,8 @@
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 
-#include <asm/arch/udc.h>
-#include <asm/arch/hardware.h>
+#include <mach/udc.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
index 6dd400f55e447fe41598f4e6ab1cb28408e86738..efddf01ed17bf22774cc35de9377680a5a031600 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/pci.h>
index 66acd55346cb480a371e3ea49454e654cd1bf19c..aab1954e274715d3969101b4609f0d21129c4ed8 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 07ee00c05eddbd676fb4c88239365179b3e19b75..7e93a0975c4d0ef4de231d67a5650fa43eb6b15c 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/pci.h>
 
index 80044e8b90b2633a182c1da8647ba166f4964a4c..59b73a0ddfa93fba8b4ef21206566e190496cf6b 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 241bb5f2f424489b319b0c352373c808d13d9345..7b8a2c323840ad209c456b94e16974e2b4244f65 100644 (file)
@@ -28,8 +28,8 @@
 #include <linux/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/gtwx5715.h>
+#include <mach/hardware.h>
+#include <mach/gtwx5715.h>
 #include <asm/mach/pci.h>
 
 /*
index ef21bfb3359ab20c9e0add41195467d40d9a477f..25c21d6665ec5fafcc55bdacdb1d537902ee91b1 100644 (file)
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/gtwx5715.h>
+#include <mach/gtwx5715.h>
 
 /*
  * Xscale UART registers are 32 bits wide with only the least
similarity index 87%
rename from include/asm-arm/arch-ixp4xx/avila.h
rename to arch/arm/mach-ixp4xx/include/mach/avila.h
index 88f053d64430e0a128af19cda222e68516c356af..1640cb61972b729c01851e2fafb56bf4f7443d56 100644 (file)
@@ -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
similarity index 87%
rename from include/asm-arm/arch-ixp4xx/coyote.h
rename to arch/arm/mach-ixp4xx/include/mach/coyote.h
index 428b298afc1fdb0f8f2ca723ede8e341e4570cf6..717ac6d16f55603474fe4c511f389aad648b3cde 100644 (file)
@@ -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 */
similarity index 96%
rename from include/asm-arm/arch-ixp4xx/cpu.h
rename to arch/arm/mach-ixp4xx/include/mach/cpu.h
index 2fa3d6b8dbb8de9074b642e4593c7ee479b21fab..ff8aa2393bf94abd41bef12956686bedeecaa4de 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp4xx/cpu.h
+ * arch/arm/mach-ixp4xx/include/mach/cpu.h
  *
  * IXP4XX cpu type detection
  *
similarity index 93%
rename from include/asm-arm/arch-ixp4xx/debug-macro.S
rename to arch/arm/mach-ixp4xx/include/mach/debug-macro.S
index 37bc8ef23e6759a5cfb1014cdc09e2bb0c463e4a..7c6a6912acdeef809e1e1296b187cf905c4d637a 100644 (file)
@@ -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
  *
similarity index 86%
rename from include/asm-arm/arch-ixp4xx/dma.h
rename to arch/arm/mach-ixp4xx/include/mach/dma.h
index 0b755d6e91985701ac6002287502a1e0aa0ec218..00c5070c0201dc8d402aadbf33425071bac8cb70 100644 (file)
@@ -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)
 
similarity index 93%
rename from include/asm-arm/arch-ixp4xx/dsmg600.h
rename to arch/arm/mach-ixp4xx/include/mach/dsmg600.h
index 5afae8c2e29614b361842cc5edd73317eb64015e..dc087a34a268a7fc3bf71be3f8ff4ecff354540f 100644 (file)
@@ -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
similarity index 93%
rename from include/asm-arm/arch-ixp4xx/entry-macro.S
rename to arch/arm/mach-ixp4xx/include/mach/entry-macro.S
index ed313c52a8a42591cfc3e38e3576986bd77fe450..f2e14e94ed15b802bc91e677a2227f66599f205a 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-ixp4xx/fsg.h
rename to arch/arm/mach-ixp4xx/include/mach/fsg.h
index 168b9848eb4aa039a6da595000be860deafd898d..1f02b7e22a139e4042886352bbe7fa446493f956 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-ixp4xx/gpio.h
rename to arch/arm/mach-ixp4xx/include/mach/gpio.h
index 28e7d27b1b8f49449d6c4b9596c846d47a504294..9fbde177920f74bf8f741ca2924a4f9cdf339030 100644 (file)
@@ -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)
 {
similarity index 96%
rename from include/asm-arm/arch-ixp4xx/gtwx5715.h
rename to arch/arm/mach-ixp4xx/include/mach/gtwx5715.h
index 2192dedc2f593cf9b7d69da8b5dc980d80b4fea6..5d5e201cac7e69562393c4f51cc4612afcfee69b 100644 (file)
@@ -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"
 
similarity index 93%
rename from include/asm-arm/arch-ixp4xx/hardware.h
rename to arch/arm/mach-ixp4xx/include/mach/hardware.h
index fa723a62785450ca393e7ab220f76d8b23b9dbf9..f58a43a2396638bc315d3e8444472272f61c1353 100644 (file)
@@ -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 */
similarity index 99%
rename from include/asm-arm/arch-ixp4xx/io.h
rename to arch/arm/mach-ixp4xx/include/mach/io.h
index 8e7426081f0e031e50ade6379dff630f87e34d90..319948e31bec2d95d16ac669bdf86c005ed3b161 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-ixp4xx/irqs.h
rename to arch/arm/mach-ixp4xx/include/mach/irqs.h
index 674af4a841470a861ed00d73590937d4beba27e1..f4d74de1566a5abce40410832f321a4fc16dae59 100644 (file)
@@ -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
  *
similarity index 87%
rename from include/asm-arm/arch-ixp4xx/ixdp425.h
rename to arch/arm/mach-ixp4xx/include/mach/ixdp425.h
index d0a1dcb48d535042617347c91f8439f2e1da0a88..2cafe65ebfee1979b366363289e753ff83e40215 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
rename to arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
index 68aca8554f5ad5556ddae23be4143563bb8e4d33..ad9c888dd8505ba54fa08a2ad8d4d078d278ca0f 100644 (file)
@@ -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 
similarity index 95%
rename from include/asm-arm/arch-ixp4xx/memory.h
rename to arch/arm/mach-ixp4xx/include/mach/memory.h
index af9667b57ab379be02824371929a47b19653ccc9..c4d2830ac987463da197bd43aed72364009d5418 100644 (file)
@@ -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.
  */
similarity index 90%
rename from include/asm-arm/arch-ixp4xx/nas100d.h
rename to arch/arm/mach-ixp4xx/include/mach/nas100d.h
index ecb12d66399c84afc7cd79bdcac670cf62201180..3771d62a97486b1ee9f15a74f5d5704a6da5bd4d 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-ixp4xx/nslu2.h
rename to arch/arm/mach-ixp4xx/include/mach/nslu2.h
index fa895f44e4312c839e6a40f8760a32d118cef77c..85d00adbfb920024c1c8617cc75e6f54c0099e6a 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-ixp4xx/platform.h
rename to arch/arm/mach-ixp4xx/include/mach/platform.h
index b2af5154cef3b42b095c765196247b70a8a8a531..e824c02c825aa8c1885206d5f5a8bcf758041776 100644 (file)
@@ -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__
similarity index 86%
rename from include/asm-arm/arch-ixp4xx/prpmc1100.h
rename to arch/arm/mach-ixp4xx/include/mach/prpmc1100.h
index 100855feafdd397a3be44cb5c364c15419d7f8d5..17274a2e3decf1c373414520f7d8e848b9c86dfb 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-ixp4xx/system.h
rename to arch/arm/mach-ixp4xx/include/mach/system.h
index f11b92262a07cdec63cd05343307765f0b65c1c2..92a7e8ddf69a3b09c1f551884047fea64cb83927 100644 (file)
@@ -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)
 {
similarity index 81%
rename from include/asm-arm/arch-ixp4xx/timex.h
rename to arch/arm/mach-ixp4xx/include/mach/timex.h
index c2559e28cbcb6ebc6a9812f76fbfdf556fed023e..89ce3ee846986d735a0097246b4e39209a8aadb5 100644 (file)
@@ -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 
similarity index 72%
rename from include/asm-arm/arch-ixp4xx/udc.h
rename to arch/arm/mach-ixp4xx/include/mach/udc.h
index dbdec36ff0d1bc7642dd64c662ea17262a52a13a..80d6da2eaface5f61e5a10ce77790a6b15333ee2 100644 (file)
@@ -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>
similarity index 96%
rename from include/asm-arm/arch-ixp4xx/uncompress.h
rename to arch/arm/mach-ixp4xx/include/mach/uncompress.h
index 34ef48fe327eff50b05329a9a053a61a758f724b..2db0078a8cf24d8284bb876ae4c14c8b35a41dde 100644 (file)
@@ -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.
similarity index 50%
rename from include/asm-arm/arch-ixp4xx/vmalloc.h
rename to arch/arm/mach-ixp4xx/include/mach/vmalloc.h
index 050d46e6b126bc093b3ec342ba42044380361105..7b3580b53adf3689a542d26670b550698d44bda4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-ixp4xx/vmalloc.h
+ * arch/arm/mach-ixp4xx/include/mach/vmalloc.h
  */
 #define VMALLOC_END       (0xFF000000)
 
index 9ec957196c7089312e8e779bbb6cc507acb11e09..64c29aacaac9f5e971976d3d1322bb2b496b4254 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <asm/mach/pci.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 void __init ixdp425_pci_preinit(void)
index 8666a428f9bec637575fc73c025167f853430e06..9b2d2ec14c8067153ae7e2741f8af05cf590e42c 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
index fac9e5cdab208a06f5c577c778879a1f43a795c7..4ed7ac6149209448cba57dd42d49c28bb2a9eb7e 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/pci.h>
 
index 63a23fa4aab4c21b9d03d44ce08fa5023621badf..c73a94d0ca2ba12a43867b8c4dd2418dcadeb50a 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <asm/arch/npe.h>
+#include <mach/npe.h>
 
 #define DEBUG_MSG                      0
 #define DEBUG_FW                       0
index fab94eaecee7abb797b1645a121229f41d7eaf91..c6cb069a5a83cea283e94dfc906f1ae81558a320 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/arch/qmgr.h>
+#include <mach/qmgr.h>
 
 #define DEBUG          0
 
index 0fd513af9a45bdba4e27d5fd5742caf92d739c28..9b59ed03b15133713a0cf91939122d6e7569276b 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/mach/pci.h>
 
index c426dcb5b9b32c3249c3d8f329014879204af215..7ea782021d1f56de331f24bef9cacf9d84f8d60c 100644 (file)
@@ -23,7 +23,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 8a7ebe9ad7f1b1f3cb133903138ca31f26d46f21..c79f492072f995d47818c4e1df21f5a0f9e6c456 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "common.h"
 
 /*
index 5938a3b33cdc2c79357e375eecb60d1868d1cd24..0e509b8ad56edadabf9b77a66dbcdd85fe481a60 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/timex.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/arch/kirkwood.h>
+#include <mach/kirkwood.h>
 #include <asm/plat-orion/cache-feroceon-l2.h>
 #include <asm/plat-orion/ehci-orion.h>
 #include <asm/plat-orion/orion_nand.h>
index d5c482c628e3c1d579c20be3e763531528cdb3fc..610fb24d8ae2ed4fcbc7e9220a5849508ef5a5cb 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/kirkwood.h>
+#include <mach/kirkwood.h>
 #include "common.h"
 
 static struct mv643xx_eth_platform_data db88f6281_ge00_data = {
similarity index 84%
rename from include/asm-arm/arch-kirkwood/debug-macro.S
rename to arch/arm/mach-kirkwood/include/mach/debug-macro.S
index f55fb8ad9ee45e660e0e0ab6d28548690d4aec8b..c0cc5b5c82ac958d7bef895c7dccd664d2c69374 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-kirkwood/entry-macro.S
rename to arch/arm/mach-kirkwood/include/mach/entry-macro.S
index fc6a43d9355c12cd6e944f2f627b8bdaa51ab195..83e0cba77b36f7be2bf0c7dbc816bf08f8494288 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-kirkwood/hardware.h
rename to arch/arm/mach-kirkwood/include/mach/hardware.h
index e695719771a5ad241477a22ffba51129dc46b448..cde85283f7d3cdb91042e2b6caec4e0dad7efdd7 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-kirkwood/io.h
rename to arch/arm/mach-kirkwood/include/mach/io.h
index 0ef6e95f5d5b11685dd974dbb06d83be4ea8f89d..be07be0ef5224e829799e61faaad975949f88c5d 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-kirkwood/irqs.h
rename to arch/arm/mach-kirkwood/include/mach/irqs.h
index 2e7b5da6335cfd7d3450d523748f25a5ce86584b..6fd05838c72d6cef62f4253b4cd76b612074ee6d 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-kirkwood/kirkwood.h
rename to arch/arm/mach-kirkwood/include/mach/kirkwood.h
index bb31b315c350ea36c60a1b567199db87dba369af..d1336b41f0fb3056dbbbeca60729b7df75747d00 100644 (file)
@@ -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.
similarity index 80%
rename from include/asm-arm/arch-mv78xx0/memory.h
rename to arch/arm/mach-kirkwood/include/mach/memory.h
index 721a6b185b91c1091dca07e59bf0935fa7cb6729..b5fb34bdccd5a16065fdcfb7fcd74b36ce9650a9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-mv78xx0/memory.h
+ * arch/arm/mach-kirkwood/include/mach/memory.h
  */
 
 #ifndef __ASM_ARCH_MEMORY_H
similarity index 84%
rename from include/asm-arm/arch-mv78xx0/system.h
rename to arch/arm/mach-kirkwood/include/mach/system.h
index 7eb47d376db90507c154e0715d6ce119ef7751b6..8510f6cfdabf09b2a96a4ba91ffe9a166a1315d5 100644 (file)
@@ -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)
 {
similarity index 85%
rename from include/asm-arm/arch-kirkwood/timex.h
rename to arch/arm/mach-kirkwood/include/mach/timex.h
index 82122e134e3c0191b8e8059bbe64f66dcbeb2a07..f77ef4a32c5fef6c77664376d52752cfb8438b4e 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-kirkwood/uncompress.h
rename to arch/arm/mach-kirkwood/include/mach/uncompress.h
index a9062b6d768065edcad42b08300ab577a2c89084..75d5497df3a85b765c12f907ae1c901a0a1407ab 100644 (file)
@@ -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/arch/arm/mach-kirkwood/include/mach/vmalloc.h b/arch/arm/mach-kirkwood/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..8f48260
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-kirkwood/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe800000
index 6cf642c504d385ddc03754d4d8bb18ee7bc5b6d4..182230a5d198a77b7686909ea443cffb4f6e2ae2 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/kirkwood.h>
+#include <mach/kirkwood.h>
 #include "common.h"
 
 #define RD88F6192_GPIO_USB_VBUS                10
index b6437f47a77f820ebb64557731303dbaa9d7496c..d8a43018c7d3b519313df9f09364fe09794821ea 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/kirkwood.h>
+#include <mach/kirkwood.h>
 #include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 
index 05ac2bd040205e5dd949b96d164727daa8ea60dd..0468e93b7d3b3c2656f1537aa0a9698e3123cb87 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/devices.h>
+#include <mach/devices.h>
 
 #include "generic.h"
 
index 97ab618fc3580eca5778392bdcafa9a522609249..c6c08e800233c90f0d85010e54e54a18840c51a5 100644 (file)
 #include <linux/module.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/regs-sys.h>
-#include <asm/arch/regs-misc.h>
+#include <mach/regs-sys.h>
+#include <mach/regs-misc.h>
 
 
 static struct __initdata map_desc ks8695_io_desc[] = {
index 3db2ec61d06f5f5206bfa46e935712bfc1abf382..4bd251482c8ff8b9e7d636cdb57555fd7b0d778b 100644 (file)
@@ -22,9 +22,9 @@
 
 #include <linux/platform_device.h>
 
-#include <asm/arch/regs-wan.h>
-#include <asm/arch/regs-lan.h>
-#include <asm/arch/regs-hpna.h>
+#include <mach/regs-wan.h>
+#include <mach/regs-lan.h>
+#include <mach/regs-hpna.h>
 
 
 /* --------------------------------------------------------------------
index a1e46436a940600e1c5837dd07b5358e87e67227..3624e65cd89b8752622802799e2fc343324cb303 100644 (file)
 #include <linux/module.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/gpio.h>
 
 /*
  * Configure a GPIO line for either GPIO function, or its internal
similarity index 89%
rename from include/asm-arm/arch-ks8695/debug-macro.S
rename to arch/arm/mach-ks8695/include/mach/debug-macro.S
index d2583ffffa9528583e94f169c3869eeb3fd070c3..3782c3559497e52464d0aca8ba56a917b8198078 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-ks8695/devices.h
rename to arch/arm/mach-ks8695/include/mach/devices.h
index 7ad2c656e162bf436fc729242ee6b8915122a8a0..2744fecb429cd44bf14a9b7c83e02c697660abcd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/devices.h
+ * arch/arm/mach-ks8695/include/mach/devices.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
similarity index 94%
rename from include/asm-arm/arch-ks8695/dma.h
rename to arch/arm/mach-ks8695/include/mach/dma.h
index e5159ed42a4bf4068ba8854eee818737de868a64..56120628008964105c99633b0f2c02c90474b40f 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-ks8695/entry-macro.S
rename to arch/arm/mach-ks8695/include/mach/entry-macro.S
index 3993cfe67cfa6a66f17ac942f3a991d7969cb4df..b4fe0c11c6ce37e02bc7c79dc50be503f91bf2fc 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-ks8695/gpio.h
rename to arch/arm/mach-ks8695/include/mach/gpio.h
index 65ceea28607b07ebd96cf7a450550e1f84403de5..73c84168761ce4bf34decb42a536da6b16653d4b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/gpio.h
+ * arch/arm/mach-ks8695/include/mach/gpio.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
similarity index 95%
rename from include/asm-arm/arch-ks8695/hardware.h
rename to arch/arm/mach-ks8695/include/mach/hardware.h
index cb732bff328889704b2b810dffb884ad1c6b7135..1d640d075b7e58b68ab9b9aad62e6e9ed90adc08 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-ks8695/io.h
rename to arch/arm/mach-ks8695/include/mach/io.h
index 8edc4bd6aadfbc57df4cee0c4335cd2258c107fd..f364f24ffe1ec44a1bc1a8e4c269e552b1dba95e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ks8695/io.h
+ * arch/arm/mach-ks8695/include/mach/io.h
  *
  * Copyright (C) 2006 Andrew Victor
  *
similarity index 97%
rename from include/asm-arm/arch-ks8695/irqs.h
rename to arch/arm/mach-ks8695/include/mach/irqs.h
index 8b1c4fe96a81280191299a746f4485b53f63ff98..86fc9e6ce404a2988a0bdd49282a43ef729485b2 100644 (file)
@@ -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>
similarity index 94%
rename from include/asm-arm/arch-ks8695/memory.h
rename to arch/arm/mach-ks8695/include/mach/memory.h
index 1b542f77977a6d88a3a800fae948698963193faf..dadbe66cb75c42b2364436ba2bc8736096d7c28a 100644 (file)
@@ -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.
similarity index 97%
rename from include/asm-arm/arch-ks8695/regs-gpio.h
rename to arch/arm/mach-ks8695/include/mach/regs-gpio.h
index 6b95d77aea190e89c233f604461bf945cddc5dfa..0df6fe61d1ce59afe761183b5c073551f5c71bd3 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-ks8695/regs-hpna.h
rename to arch/arm/mach-ks8695/include/mach/regs-hpna.h
index 14091cdec10358b3a6b17eace1ca1d0ffa27426d..815ce5c2e3b9b7afd6d62f9fed7d92186fab1c4e 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-ks8695/regs-irq.h
rename to arch/arm/mach-ks8695/include/mach/regs-irq.h
index 70b193f6b756a088ec09be5bce8f669f7be41fb1..352b7e8704d5fdedf4e203719d6f14d52c982ff4 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-ks8695/regs-lan.h
rename to arch/arm/mach-ks8695/include/mach/regs-lan.h
index a63bd61c64edeba4e67d6f64ecaa12569376ea54..9ef409901e764247f88efbe7041b01250b093d20 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-ks8695/regs-mem.h
rename to arch/arm/mach-ks8695/include/mach/regs-mem.h
index 76b38e0862e6809778018709af296af683a0caea..55806bc68ce36c1d4dd7da09b7070a4aadd501c4 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-ks8695/regs-misc.h
rename to arch/arm/mach-ks8695/include/mach/regs-misc.h
index 632ca6601a94a26cfaa2968b1956bec982c32e42..2740c52494a0923554a0d6207510eca5841c1af9 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-ks8695/regs-pci.h
rename to arch/arm/mach-ks8695/include/mach/regs-pci.h
index 286d6d488df85e3caf85c857abffe95f0001eaa8..75a9db6edbd9663323b0cd080e1db212461a3e3b 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-ks8695/regs-switch.h
rename to arch/arm/mach-ks8695/include/mach/regs-switch.h
index 5f37be3f2f60d934ab6399215d9677919effc6ca..56d12e8de8955948111b9229911701b959bbf891 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-ks8695/regs-sys.h
rename to arch/arm/mach-ks8695/include/mach/regs-sys.h
index f3179815b8ee3af91489dcb099b1121ffe9d035f..57c20be0c129e85ec96121d8a564963924ee56a4 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-ks8695/regs-timer.h
rename to arch/arm/mach-ks8695/include/mach/regs-timer.h
index 0a9f7f99ec52998dc05fe41618d8ef4f151ae409..e620cda99d2dde1e03129b8ebecdb8d9b3ee9c74 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-ks8695/regs-uart.h
rename to arch/arm/mach-ks8695/include/mach/regs-uart.h
index a27cb20502a36e20aeb28601848197bda0c1a3ce..8581fbc6245faea94218c4c74f5e3d323bab98d1 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-ks8695/regs-wan.h
rename to arch/arm/mach-ks8695/include/mach/regs-wan.h
index 52e35b0d65e47e60e90eb2b1a0b2185bfe62764c..eb494ec6e95690fb28f8c3fb44559d29c983a8ce 100644 (file)
@@ -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
  *
similarity index 92%
rename from include/asm-arm/arch-ks8695/system.h
rename to arch/arm/mach-ks8695/include/mach/system.h
index 3bc28106d937b440e2a3c206cfabc32f7a186a0e..2a6f91869056357607f7bc81eceda2ace4077378 100644 (file)
@@ -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)
 {
similarity index 90%
rename from include/asm-arm/arch-ks8695/timex.h
rename to arch/arm/mach-ks8695/include/mach/timex.h
index 8320d528b903b66aa198eedca5da4f110bb36363..4682e350369befa80f4163f772e6161a3446c873 100644 (file)
@@ -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>
similarity index 90%
rename from include/asm-arm/arch-ks8695/uncompress.h
rename to arch/arm/mach-ks8695/include/mach/uncompress.h
index 733a50855b5dc73f83d108d5e992b4571731668a..0eee37a690756b6c3ce2acdc0a032db35e42d408 100644 (file)
@@ -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)
 {
similarity index 90%
rename from include/asm-arm/arch-ks8695/vmalloc.h
rename to arch/arm/mach-ks8695/include/mach/vmalloc.h
index d1d88e58117d3037e1ec82c45b39e9d12bb9b85d..744ac66be3a214d457b2293fe75a8d543a986fb5 100644 (file)
@@ -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>
index 0773ae79572edf5d749e0de0f7a94f6843c46498..e5e71f4dbb8481aa6bdd959c62883cb223c751f7 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
 
 static void ks8695_irq_mask(unsigned int irqno)
 {
index 17c5ef13b0d1a4cd7aa4e6ad5804ae4aafdee7b3..184ef74e4bee53151666d7d26396964d7c36bcb6 100644 (file)
@@ -13,8 +13,8 @@
 #include <linux/init.h>
 
 #include <asm/leds.h>
-#include <asm/arch/devices.h>
-#include <asm/arch/gpio.h>
+#include <mach/devices.h>
+#include <mach/gpio.h>
 
 
 static inline void ks8695_led_on(unsigned int led)
index c0c2d5901590735efb6e1477094f42f374e23847..1746c67af1762f71ba42045088784fdc778cc68c 100644 (file)
 #include <asm/io.h>
 #include <asm/signal.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/devices.h>
-#include <asm/arch/regs-pci.h>
+#include <mach/devices.h>
+#include <mach/regs-pci.h>
 
 
 static int pci_dbg;
index 02f766b3121dcf35c02b07efa0cfabfc3dadc1c0..940888dffc16898f7177e4a1957016bed85062eb 100644 (file)
@@ -28,8 +28,8 @@
 #include <asm/io.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/regs-timer.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-timer.h>
+#include <mach/regs-irq.h>
 
 #include "generic.h"
 
index 8cec912fd0307e613a7058e41cfb2a86f817837a..50d23246d4f064dbbb1fc88f2169b8b2f23c26d7 100644 (file)
@@ -13,7 +13,7 @@
 #include <asm/types.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 
 #include <asm/mach/arch.h>
similarity index 88%
rename from include/asm-arm/arch-l7200/aux_reg.h
rename to arch/arm/mach-l7200/include/mach/aux_reg.h
index 762cbc76c5017c6d449906ef08abef8e0799ad5a..4671558cdd51a20782ffd339d8ef1f3507bf3cf7 100644 (file)
@@ -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))
 
similarity index 95%
rename from include/asm-arm/arch-l7200/debug-macro.S
rename to arch/arm/mach-l7200/include/mach/debug-macro.S
index 846473318e8b9c687b769b7588911a7dc5b073f9..34eed2a63e69951eda7db9f8ea291dd04ba5be1b 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-l7200/dma.h
rename to arch/arm/mach-l7200/include/mach/dma.h
index 4c7eca63f03533d5b5a7a93cb3286acdb2db08e2..c7e48bd4590cbe099033e93ba87259958f5c146c 100644 (file)
@@ -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)
  *
similarity index 91%
rename from include/asm-arm/arch-l7200/entry-macro.S
rename to arch/arm/mach-l7200/include/mach/entry-macro.S
index d5e7294df1d5eaeff80d42a9820a4adad9ee2b7b..1726d91fc1d3de6dfcb8b14233666840feec24d9 100644 (file)
@@ -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
 
similarity index 92%
rename from include/asm-arm/arch-l7200/gp_timers.h
rename to arch/arm/mach-l7200/include/mach/gp_timers.h
index 6f20962df2480a5961158cbe7cae1bfeb835181f..2b7086a26b81fc2ff24810f9b31acde7e5d911da 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-l7200/gpio.h
rename to arch/arm/mach-l7200/include/mach/gpio.h
index 0b63e4239bdd045e993212ea63aacdbbf6a1870a..c7b0a5d7b8bb9ea0d235a0cdeccebd56ab4dbedd 100644 (file)
@@ -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.
similarity index 97%
rename from include/asm-arm/arch-l7200/hardware.h
rename to arch/arm/mach-l7200/include/mach/hardware.h
index 2ab43f3a4a8deafee20d63b20f7da469214f4918..c31909cfc254e1fbb6ab83d73ef3935cd62f18ce 100644 (file)
@@ -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)
similarity index 75%
rename from include/asm-arm/arch-l7200/io.h
rename to arch/arm/mach-l7200/include/mach/io.h
index e24a10a7ed8ccc8dee79b54bf588af512f5c90a7..d432ba9e5dff8308974e9ebb8deebcaa45cc06e5 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-l7200/irqs.h
rename to arch/arm/mach-l7200/include/mach/irqs.h
index 7120c016e29efb1831700b78338789e6d1f77d84..7edffd713c5bc11c1b0dc7a088d861fa9d9c2f4d 100644 (file)
@@ -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)
similarity index 93%
rename from include/asm-arm/arch-l7200/memory.h
rename to arch/arm/mach-l7200/include/mach/memory.h
index 402df637e7403b1924a9e20a0bc432852d7307ad..f338cf3ffd93d4498a169e0fff712753b3ac81ea 100644 (file)
@@ -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)
similarity index 96%
rename from include/asm-arm/arch-l7200/pmpcon.h
rename to arch/arm/mach-l7200/include/mach/pmpcon.h
index 730056c194be92e7462fac1a0f339a1b7c493a53..3959871e8361661a3e748151dfef382a1bca72b7 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-l7200/pmu.h
rename to arch/arm/mach-l7200/include/mach/pmu.h
index 57faea76d1b343dfc4e3f3d317783cbceca49177..a2da7aedf2088b7c17e2a3a4f0459a36440683a3 100644 (file)
@@ -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).
similarity index 95%
rename from include/asm-arm/arch-l7200/serial.h
rename to arch/arm/mach-l7200/include/mach/serial.h
index defb8b7fca737c87dc15881145673e53d602c7e3..adc05e5f837898ae8c14632d3a8f74d35523b6f0 100644 (file)
@@ -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)
similarity index 97%
rename from include/asm-arm/arch-l7200/serial_l7200.h
rename to arch/arm/mach-l7200/include/mach/serial_l7200.h
index b1008a9d23e5a8aea54870ff13eccb6604370161..645f1c5e568d827a3a5d3a977e6b2c8998d0ccb7 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-l7200/sib.h
rename to arch/arm/mach-l7200/include/mach/sib.h
index bf4364ee25351bf51c4db7824a570d4a88b0c2e8..965728712cf3f8b1539f7fe0770c570045c6ceed 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-l7200/sys-clock.h
rename to arch/arm/mach-l7200/include/mach/sys-clock.h
index 771c774f4815194d5990f5e47c56d645b636d4f3..2d7722be60eae8a1de519f0891577556bc50de78 100644 (file)
@@ -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.
similarity index 86%
rename from include/asm-arm/arch-l7200/system.h
rename to arch/arm/mach-l7200/include/mach/system.h
index efef950a5b5d865de1b0ca6a1bec7a5158a8678e..5272abee0d0e43c6924ee16588b283ef0c5ba488 100644 (file)
@@ -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)
 {
similarity index 96%
rename from include/asm-arm/arch-l7200/time.h
rename to arch/arm/mach-l7200/include/mach/time.h
index ea22f7fff9cd7131401fa67695486dea82d4e6bc..061771c2c2bd265bdbc6d324ae868e372c097b0e 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-l7200/timex.h
rename to arch/arm/mach-l7200/include/mach/timex.h
index 3c3202620f00efe32d500a27260cc11833eb65bb..ffc96a63b5a22759a700e1ddd3243dfa98b4ad49 100644 (file)
@@ -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)
similarity index 91%
rename from include/asm-arm/arch-l7200/uncompress.h
rename to arch/arm/mach-l7200/include/mach/uncompress.h
index c5ba0adf4a5dff16b51afa88f739e14bffbaa44a..591c962bb3158e140d964a38526487396f28d717 100644 (file)
@@ -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
 
similarity index 56%
rename from include/asm-arm/arch-l7200/vmalloc.h
rename to arch/arm/mach-l7200/include/mach/vmalloc.h
index 816231eedaac95fbe109cfa503462a11c1055b5d..85f0abbf15f1cc011dc1e65475dab18cc330c3eb 100644 (file)
@@ -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)
index c794ca7a5f20a074f7c72ae1f0beff661a10e0bb..551b972618268d1cee0aef6286ba8c9aebee236e 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index ff3109a00c2b2d1d2866b86752b477befe3863dc..e373fb8e26999911b3ce8e2575d02369019390b9 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 395ad9b83c400db0f9b8c7f0e2af6bdff2c46890..a2a543258fc371d5d36123ca394b4f3774866f34 100644 (file)
@@ -23,7 +23,7 @@
 #include <asm/mach/irq.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
index 9fe7f3a48949a5868e39ecbff795a3beebefaf4f..4fb23ac6b5ac6edef40c2fd84010b000ee32d790 100644 (file)
@@ -9,8 +9,8 @@
  */
 
 #include <linux/cpufreq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/clocks.h>
+#include <mach/hardware.h>
+#include <mach/clocks.h>
 #include <linux/err.h>
 
 struct module;
similarity index 90%
rename from include/asm-arm/arch-lh7a40x/clocks.h
rename to arch/arm/mach-lh7a40x/include/mach/clocks.h
index 7d0ba18ad5787d7ebdb3aaba80867d0dbbef2e77..fe2e0255c084290b9cbd16cdca2a65246e4d8461 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-arm/arch-lh7a40x/clocks.h
+/* arch/arm/mach-lh7a40x/include/mach/clocks.h
  *
  *  Copyright (C) 2004 Marc Singer
  *
similarity index 98%
rename from include/asm-arm/arch-lh7a40x/constants.h
rename to arch/arm/mach-lh7a40x/include/mach/constants.h
index 51de96e87faf93753332139f2789be08ec5b4bf0..55c6edbc2dfd2e4760f2fe8387ca57c1a670dfcf 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-lh7a40x/debug-macro.S
rename to arch/arm/mach-lh7a40x/include/mach/debug-macro.S
index 421dcd6a8506206f0a836169527f02ba1fdc6f9c..85141ed5383d1c355af041622099d545c5c1dfef 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-lh7a40x/dma.h
rename to arch/arm/mach-lh7a40x/include/mach/dma.h
index a8cbd14bbf9d7693c41eea756175a5e75c6c29fc..baa3f8dbd04b2c02b7d44dbf7ba66af87022d48a 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-arm/arch-lh7a40x/dma.h
+/* arch/arm/mach-lh7a40x/include/mach/dma.h
  *
  *  Copyright (C) 2005 Marc Singer
  *
similarity index 97%
rename from include/asm-arm/arch-lh7a40x/entry-macro.S
rename to arch/arm/mach-lh7a40x/include/mach/entry-macro.S
index 34468e06462993a9eebf03071f791f704c932ed0..069bb4cefff79125d3ff6b7bde7cbe5fc2f582cd 100644 (file)
@@ -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
similarity index 93%
rename from include/asm-arm/arch-lh7a40x/hardware.h
rename to arch/arm/mach-lh7a40x/include/mach/hardware.h
index e9ff74fd79396a882c2889310dcc2ef939d2cbd2..48e827d2fa5693a86a0eb9903cda870f4e060e21 100644 (file)
@@ -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
similarity index 87%
rename from include/asm-arm/arch-lh7a40x/io.h
rename to arch/arm/mach-lh7a40x/include/mach/io.h
index 8d591d0927c15f35bc6e8b00a034e18e5e710235..031d26f9163cb5e6a7b4994d93e220b90cf8b86f 100644 (file)
@@ -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
 
similarity index 99%
rename from include/asm-arm/arch-lh7a40x/irqs.h
rename to arch/arm/mach-lh7a40x/include/mach/irqs.h
index afe8c7cbad6a181d552550cab3c00c47d302ade7..0f9b83675935c49d5cde29fa76fa96cdd3927209 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-lh7a40x/memory.h
rename to arch/arm/mach-lh7a40x/include/mach/memory.h
index 9b0c8012e71351e164d715100550e9b8f08b6647..f7107b4c197a7ad4d143730138eea1d831f47371 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-lh7a40x/registers.h
rename to arch/arm/mach-lh7a40x/include/mach/registers.h
index b4f09b3e2d0376564308474a5987123f219bdb44..ea44396383a7f849b08cb2e6de56ab04a8ae6412 100644 (file)
@@ -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
similarity index 88%
rename from include/asm-arm/arch-lh7a40x/system.h
rename to arch/arm/mach-lh7a40x/include/mach/system.h
index e1df8aa460f2cf6dc4d25227664c966141f51c47..fa46bb1ef07be13776542b17374e464c7a01c725 100644 (file)
@@ -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
  *
similarity index 82%
rename from include/asm-arm/arch-lh7a40x/timex.h
rename to arch/arm/mach-lh7a40x/include/mach/timex.h
index fa726b6708291d13826b8d85cd671c74e705ae38..08028cef1b3bb0658caaa95c5981e50d422f76cb 100644 (file)
@@ -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)
 
similarity index 91%
rename from include/asm-arm/arch-lh7a40x/uncompress.h
rename to arch/arm/mach-lh7a40x/include/mach/uncompress.h
index 3d1ce0426a33646127a90e92f1a3b05a47e2fb48..55b80d479eb44588b509745f78fc6c65e469043a 100644 (file)
@@ -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)
similarity index 86%
rename from include/asm-arm/arch-lh7a40x/vmalloc.h
rename to arch/arm/mach-lh7a40x/include/mach/vmalloc.h
index 8163e45109b9f63e44e4a811696a46c9888a8ff5..3fbd49490bb9d7290165aba3e6d67fa425d41a4e 100644 (file)
@@ -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
  *
index 0e5a805036dbc0c795a6895f1f3116f33f353e78..1ad3afcf6b3dc67f9712773315e733cb5ba7e285 100644 (file)
 #include <linux/module.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include "common.h"
 
index f3293bfac8c6048a5efd924edab8da3aab0d1362..12b045b688c6a60f66bab54ccb4403c83360d5a9 100644 (file)
 #include <linux/module.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include "common.h"
 
index 41bf9f817b91c2cf449ebb1176181d0aa710316e..0d5063ebda10f51caf9641660575ee238a7d2852 100644 (file)
 #include <linux/module.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include "common.h"
 
index 4cd31bb8a8b87f69cf1ec814abb42c68db5e8554..51fbef9601b954dd512fed71bc7b83bcde3bc4bf 100644 (file)
@@ -46,9 +46,9 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/ssp.h>
+#include <mach/ssp.h>
 
 //#define TALK
 
index 1c7e469e3528d2ebcf0501f784276df8ae281fd0..7fe9e06cf662f31113b5dd40bde63052f8675933 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/irq.h>
 #include <linux/time.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
index 3b6319d4c1ceadca8313fddd0b77ed631a35cbe0..70ca56bb6f330bc0eb85da19f0a46abdc454962b 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mbus.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include "common.h"
 
index 410f50399dd3607cc7c51559008ffbf46cfbd9aa..e20cdbca1ebe95bc5dcb62b2e109e6864c0f2d89 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/timex.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/arch/loki.h>
+#include <mach/loki.h>
 #include <asm/plat-orion/orion_nand.h>
 #include <asm/plat-orion/time.h>
 #include "common.h"
similarity index 85%
rename from include/asm-arm/arch-loki/debug-macro.S
rename to arch/arm/mach-loki/include/mach/debug-macro.S
index 585502e96513a60d444dbb0ee9c8f81476426277..a8c20bd2f9514d87ca5acef76b0ce75ddf250d05 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-loki/entry-macro.S
rename to arch/arm/mach-loki/include/mach/entry-macro.S
index 693257cdbeb87ac1cb56080f9c936cadaddbdf9e..332af38ec13c314d1a7d9c6e74b5b9e3d9fb15c8 100644 (file)
@@ -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
similarity index 86%
rename from include/asm-arm/arch-loki/hardware.h
rename to arch/arm/mach-loki/include/mach/hardware.h
index f65b01c733b662abd381bc24ccd4342d8adace0c..d7bfc8f17729fbce3dd3b5157438cd379b319f44 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-loki/io.h
rename to arch/arm/mach-loki/include/mach/io.h
index e7418a915e752038f1a33915b8e0ee3fd17a04ef..a373cd582c84d15f26084c70bc966d7796173b92 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-loki/irqs.h
rename to arch/arm/mach-loki/include/mach/irqs.h
index 7e49714380726f7b1e823fa1c1ed00ad7a20c19c..9fbd3326867b4904010ce1b4613f049404e54390 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-loki/loki.h
rename to arch/arm/mach-loki/include/mach/loki.h
index 5dd05ee0a4e629fb8a4ed074d49d7dd0aa38e0a8..c00af6ba5578bd3fe463aa8e28aa0cebe283bb55 100644 (file)
@@ -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
  *
similarity index 81%
rename from include/asm-arm/arch-kirkwood/memory.h
rename to arch/arm/mach-loki/include/mach/memory.h
index e5108f408ce646bc96bce072ef4bfd524338caf0..a39533ab489deb9affbc3d72cdb87f647aedf237 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-kirkwood/memory.h
+ * arch/arm/mach-loki/include/mach/memory.h
  */
 
 #ifndef __ASM_ARCH_MEMORY_H
similarity index 85%
rename from include/asm-arm/arch-loki/system.h
rename to arch/arm/mach-loki/include/mach/system.h
index a3568ac8ec35823984e31acab0ea789967ae4f90..8db1147d4ec5594f5084d3619039e3b8f5447c8d 100644 (file)
@@ -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)
 {
similarity index 86%
rename from include/asm-arm/arch-loki/timex.h
rename to arch/arm/mach-loki/include/mach/timex.h
index 940014f97caebdcf0e4c3aca5cf1741be7f161dd..9df210915297dafd2ea93c278202672c5530a020 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-loki/uncompress.h
rename to arch/arm/mach-loki/include/mach/uncompress.h
index 89a0cf88d3a509acde2bff3026cd003ba0ee6be1..90b2a7e65da3dc73c4d989f693223e2d6ae8160f 100644 (file)
@@ -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/arch/arm/mach-loki/include/mach/vmalloc.h b/arch/arm/mach-loki/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..8dc3bfc
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-loki/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe800000
index d1b9e6e6253a7a1a25b32a292d64c1f7f8d8e924..2cc9ac9b488f24cb8b87a72f50530cd6a34a4be5 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mv643xx_eth.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/loki.h>
+#include <mach/loki.h>
 #include "common.h"
 
 #define LB88RC8480_FLASH_BOOT_CS_BASE  0xf8000000
index 46460218a2081a9466687281a323d072e6ea6aab..995afc4ade4be14c70577ec82b793c1b7f2de154 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/msm_iomap.h>
+#include <mach/board.h>
+#include <mach/msm_iomap.h>
 
 #include <asm/io.h>
 #include <asm/delay.h>
index 3f5d3362f887da2de2f3bab432a9cdec0a967f19..3a511368a5d8b25d5e8a9a257f21f9f3382da71d 100644 (file)
@@ -28,9 +28,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/msm_iomap.h>
+#include <mach/msm_iomap.h>
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 struct flash_platform_data msm_nand_data = {
        .parts          = 0,
index 8b0f339b32746d802e7b3e9c26b74a6b74a842cb..9de08265d97411d492fc16dc3d59ed1ac9fe1a29 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <asm/io.h>
 #include <linux/interrupt.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 #define MSM_DMOV_CHANNEL_COUNT 16
 
index 2b1cb7f16943e7fbd39f61169e43f3f05e661601..6a94f052713770d382e2c6ed37841796d6235222 100644 (file)
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-msm/idle.S
+/* arch/arm/mach-msm/include/mach/idle.S
  *
  * Idle processing for MSM7K - work around bugs with SWFI.
  *
similarity index 95%
rename from include/asm-arm/arch-msm/board.h
rename to arch/arm/mach-msm/include/mach/board.h
index 763051f8ba146147de8ccb9f0a56d732cc729caf..a7639493c095391ff24da034be9f5b31bfc93855 100644 (file)
@@ -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>
similarity index 89%
rename from include/asm-arm/arch-msm/debug-macro.S
rename to arch/arm/mach-msm/include/mach/debug-macro.S
index e131b44b21078c0913c3e73e1e7a60e4e29e4547..528eef4b605cdf1ee7c4b75899e6efc441f06744 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-msm/dma.h
rename to arch/arm/mach-msm/include/mach/dma.h
index e4b565b27b35b51b480fbaab0953e92f5bfefd08..ad1c87f86d10598080627c4553b3f265273c07f4 100644 (file)
@@ -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;
similarity index 92%
rename from include/asm-arm/arch-msm/entry-macro.S
rename to arch/arm/mach-msm/include/mach/entry-macro.S
index ee24aece4cb0689a5ec30aec04a311ac17ca8678..d2259486bcb1588175df8a9f5fcdd76c5efe4aae 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-msm/hardware.h
rename to arch/arm/mach-msm/include/mach/hardware.h
index 89af2b70182f43053cf9d5491440f26c020a5776..2d126091ae415ffadbd2bac1770abfc86e6eecca 100644 (file)
@@ -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.
  *
similarity index 95%
rename from include/asm-arm/arch-msm/io.h
rename to arch/arm/mach-msm/include/mach/io.h
index 4645ae26b62a2491e1e985ee01af10180b3b8ce5..c6a2feb268b0bc8def0f0890ad1aa803ae506173 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-arm/arch-msm/io.h
+/* arch/arm/mach-msm/include/mach/io.h
  *
  * Copyright (C) 2007 Google, Inc.
  *
similarity index 98%
rename from include/asm-arm/arch-msm/irqs.h
rename to arch/arm/mach-msm/include/mach/irqs.h
index e62a108b1857d03efa49eb99c17f5dcdbf027aaf..9dd4cf8a26933da5425f89381518cffa08c09324 100644 (file)
@@ -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>
similarity index 94%
rename from include/asm-arm/arch-msm/memory.h
rename to arch/arm/mach-msm/include/mach/memory.h
index b5ce0e9ac86d5274fd7c917126b4f1ab81171290..63fd47f2e62eb4415f8492df4e26a526355600ef 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-msm/msm_iomap.h
rename to arch/arm/mach-msm/include/mach/msm_iomap.h
index b8955cc26fecbc7e05c49524c1dcaa167b9baa4a..e221f58ceea3997a0a90f0b52d997f89a0874acf 100644 (file)
@@ -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>
similarity index 89%
rename from include/asm-arm/arch-msm/system.h
rename to arch/arm/mach-msm/include/mach/system.h
index fb31b3aa6750a17e310c62e0248ee63be9b32ece..f05ad2e0f235f4988d596ee885e66768e8d39a6a 100644 (file)
@@ -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);
 
similarity index 93%
rename from include/asm-arm/arch-msm/timex.h
rename to arch/arm/mach-msm/include/mach/timex.h
index 8724487ab4c92cf8c80f4a7f948d2c6b323a27ed..a62e6b215aec6b1848980389636c3123c4f38d4d 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/arch-msm/uncompress.h
rename to arch/arm/mach-msm/include/mach/uncompress.h
index e91ed786ffec7b3d102230fb3b5074e6110149b9..026e8955ace9d4c47cc53bf1118d54ba862a3bc6 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/arch-msm/vmalloc.h
rename to arch/arm/mach-msm/include/mach/vmalloc.h
index 60f8d910e8259d4637e5a9356158240022f9a981..05f81fd8623c2534a680a2be78bf824e3673e43b 100644 (file)
@@ -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.
  *
index eca4283bbcb2a78a531774d088ef93ba1767c4ba..5976200de99b7df1e963c9983c57501aeceec78b 100644 (file)
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/arch/msm_iomap.h>
+#include <mach/msm_iomap.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #define MSM_DEVICE(name) { \
                .virtual = MSM_##name##_BASE, \
index 0535b39261f07ca30160b19616d4c96874091454..66901baf8c8e33d240c32d43af23fd485a1f5110 100644 (file)
 #include <linux/timer.h>
 
 #include <linux/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/io.h>
 
-#include <asm/arch/msm_iomap.h>
+#include <mach/msm_iomap.h>
 
 #define VIC_REG(off) (MSM_VIC_BASE + (off))
 
index bd4732d1ab3eea55159334d54ef66578088cfcd3..9f02d7dca9851f1bc2902d455706e4a6e46cc4b8 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 
 #include <asm/mach/time.h>
-#include <asm/arch/msm_iomap.h>
+#include <mach/msm_iomap.h>
 
 #include <asm/io.h>
 
index d27b83b7bf62e62161c673277a3025222912ef26..e633f9cb239f775c4a4d26b21a247d88274733c6 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/ata_platform.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/arch/mv78xx0.h>
+#include <mach/mv78xx0.h>
 #include <asm/plat-orion/cache-feroceon-l2.h>
 #include <asm/plat-orion/ehci-orion.h>
 #include <asm/plat-orion/orion_nand.h>
index 0c93d19193dfca4ac4481fabf9dd061eca48682c..a2d0c97836047441ccf486a5629f1b5a20c9e27b 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
-#include <asm/arch/mv78xx0.h>
+#include <mach/mv78xx0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include "common.h"
similarity index 84%
rename from include/asm-arm/arch-mv78xx0/debug-macro.S
rename to arch/arm/mach-mv78xx0/include/mach/debug-macro.S
index d0595bd645e5e851e0c20a4772e2f7b71ab479c3..a06442fbd3415b9bd935daf71b809685cc36e75c 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-mv78xx0/entry-macro.S
rename to arch/arm/mach-mv78xx0/include/mach/entry-macro.S
index e9a606b1266989b52af7f68a9d19e5ed0e637ea6..ed4a46bcd3b0803b67bac56adffd782926f6d60f 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-mv78xx0/hardware.h
rename to arch/arm/mach-mv78xx0/include/mach/hardware.h
index 8e17926086c67ceaf1daf51bea8cf1ecb50fce4a..5d887557e12347ab3cde47ddd0d5b1fc89c613ba 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-mv78xx0/io.h
rename to arch/arm/mach-mv78xx0/include/mach/io.h
index 415d4c98e3d18c65201a04c35b468d8c0e2f0547..450e0e1ad0920df19f330cf4c0898e6e385035e1 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-mv78xx0/irqs.h
rename to arch/arm/mach-mv78xx0/include/mach/irqs.h
index 75930450cd65a9ca5958ff2d727fab0124ad38f0..995d7fb8d06f60c252b77f13a8ccdff17f050885 100644 (file)
@@ -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
  *
similarity index 80%
rename from include/asm-arm/arch-loki/memory.h
rename to arch/arm/mach-mv78xx0/include/mach/memory.h
index 835101e49875d7e23233377c102785f51bc988fe..9e47a140ff7a124aafde3274dfe8f991db68f489 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-loki/memory.h
+ * arch/arm/mach-mv78xx0/include/mach/memory.h
  */
 
 #ifndef __ASM_ARCH_MEMORY_H
similarity index 98%
rename from include/asm-arm/arch-mv78xx0/mv78xx0.h
rename to arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
index 9f5d83c73faa100a2cf708b7a614c2524de3f738..ad664178d6e1948176e5e58dac157edf6b044056 100644 (file)
@@ -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.
similarity index 84%
rename from include/asm-arm/arch-kirkwood/system.h
rename to arch/arm/mach-mv78xx0/include/mach/system.h
index 8dde7e379855cf60e4ba95e5b2d0c03f3a28b847..7d51794088322106ce8db7342ca90cd1bb50d162 100644 (file)
@@ -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)
 {
similarity index 83%
rename from include/asm-arm/arch-mv78xx0/timex.h
rename to arch/arm/mach-mv78xx0/include/mach/timex.h
index a854b1ccbd01d19f1ad47a938732c7e78f16be32..0e8c443c723aa7409f535793370995cb5ef486f7 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-mv78xx0/uncompress.h
rename to arch/arm/mach-mv78xx0/include/mach/uncompress.h
index 3bfe0a293ef7be5d869878f14eb9d0416622da39..365264298e79750a4aa98de9149e320a079e08b9 100644 (file)
@@ -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/arch/arm/mach-mv78xx0/include/mach/vmalloc.h b/arch/arm/mach-mv78xx0/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..1c49543
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-mv78xx0/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END    0xfe000000
index 60f4ee4d4532eda998d081366f02d5d0fa7e98c9..3198abf54c9041b8857bfe7ab1073e614a44990f 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/arch/mv78xx0.h>
+#include <mach/mv78xx0.h>
 #include <asm/plat-orion/irq.h>
 #include "common.h"
 
index 4af6f4f06e8213becd436b6ad528ce1b162ae1db..c69896d011a1171cfe5819ef43a6867dd2ba092a 100644 (file)
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/common.h>
+#include <mach/clock.h>
+#include <mach/common.h>
 #include <asm/div64.h>
 
 #include "crm_regs.h"
index 33f81f2b086064abf7f7e6f3de8f4f4ba3f608ec..239308fe6652323bd225a2267c786a21c4a0fe73 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "crm_regs.h"
 
index a40a9b950ce936af60419f1502ccf16cabf56ec3..94644cd0a0fc5c7c4a14fb9057918215ad10be7a 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef __ARCH_ARM_MACH_MX2_CRM_REGS_H__
 #define __ARCH_ARM_MACH_MX2_CRM_REGS_H__
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /* Register offsets */
 #define CCM_CSCR                (IO_ADDRESS(CCM_BASE_ADDR) + 0x0)
index b5d2b63ea0df8447ab47c82cc06ca134aa2ea8af..bd0559d5933e1a03e4000050becf460252792e5f 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * Resource definition for the MXC IrDA
index 4de97e18778ecb022e2c47615f19fa32ee4f948a..dea6521d4d5c0bcc3122f2a1c28b3476178232c9 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
 
index 64c7bf67c4007bdbf2cfdbb39b5d9f86faf77ad3..4ce56ef4d8d34927ac32bff257489023c46bf59b 100644 (file)
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <asm/arch/common.h>
-#include <asm/arch/hardware.h>
+#include <mach/common.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/imx-uart.h>
-#include <asm/arch/iomux-mx1-mx2.h>
-#include <asm/arch/board-mx27ads.h>
+#include <mach/gpio.h>
+#include <mach/imx-uart.h>
+#include <mach/iomux-mx1-mx2.h>
+#include <mach/board-mx27ads.h>
 
 /* ADS's NOR flash */
 static struct physmap_flash_data mx27ads_flash_data = {
index ebe9726057609762718b145a85afa59525b51b4a..1028f453cfc8d6354ce7359afb5da2de4a0670c6 100644 (file)
 #include <linux/mtd/physmap.h>
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
-#include <asm/arch/common.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/iomux-mx1-mx2.h>
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-mx1-mx2.h>
 #include <asm/mach/time.h>
-#include <asm/arch/imx-uart.h>
-#include <asm/arch/board-pcm038.h>
+#include <mach/imx-uart.h>
+#include <mach/board-pcm038.h>
 
 /*
  * Phytec's phyCORE-i.MX27 comes with 32MiB flash,
index 165d54acebed0787aca8b44f63ea136703e6c3e3..a560cd6ad23d73b0b82c422206e271c295a9fc2e 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/arch.h>
 
 /*
index 58dda232bb626806329c0768b8ae930451b0eb7b..e31fd44f7941fcdda79eafe3da9bd28a24232336 100644 (file)
@@ -20,8 +20,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/serial.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/imx-uart.h>
+#include <mach/hardware.h>
+#include <mach/imx-uart.h>
 
 static struct resource uart0[] = {
        {
index 99304645299d03594d8ad4901d0f9e4a4504cf51..7b8269719d1175ced8a0cc546fd7e8da05c2d8f6 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/proc-fns.h>
 #include <asm/system.h>
 
index 2f3635943e70d0c67cd850904ec483fd32818b01..9f14a871ee7c5f40c53cfd050ba7e50d7350372a 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <asm/div64.h>
 
 #include "crm_regs.h"
index cdd0ff95e88d297ccb624ecfa8fb6c8387ab7cc0..e08c6a8ac56be1e56d7d521364ade09ffbe88fac 100644 (file)
@@ -21,8 +21,8 @@
 #include <linux/platform_device.h>
 #include <linux/serial.h>
 #include <linux/gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/imx-uart.h>
+#include <mach/hardware.h>
+#include <mach/imx-uart.h>
 
 static struct resource uart0[] = {
        {
index e189a5f9aba32e148d2350921f5d5f9fe6f476a2..3dda1fe23cbf13ee2346523b9f54f439498aa534 100644 (file)
@@ -21,9 +21,9 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/iomux-mx3.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/iomux-mx3.h>
 
 /*
  * IOMUX register (base) addresses
index 881b3569af5f1dd5fd32ee64f39f0365f21eb4e2..30d842bd4d64b10b39cca200d47775afa7a89c20 100644 (file)
 
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
 
 /*!
  * @file mm.c
index 63df8b0c480d2a15336e2ffa31edf1a604fe5379..60fb4e0d5acd18c20a946e4f4c6ed9a8d837c027 100644 (file)
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/memory.h>
 #include <asm/mach/map.h>
-#include <asm/arch/common.h>
-#include <asm/arch/board-mx31ads.h>
+#include <mach/common.h>
+#include <mach/board-mx31ads.h>
 
 /*!
  * @file mx31ads.c
index 03384a73f57b47982c0ca40b970ea09301623ed2..d363a6e79f8054296ecd7a90e3ddfc8f9c689bd9 100644 (file)
 #include <linux/kernel.h>
 #include <linux/memory.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
 #include <asm/page.h>
 #include <asm/setup.h>
-#include <asm/arch/board-mx31lite.h>
+#include <mach/board-mx31lite.h>
 
 /*
  * This file contains the board-specific initialization routines.
index 1bb4eadf1ec56e8977c31a64dfdf0f9979c37fbd..0a152ed15a85a44739b4f69c10b8ffbcab0c444b 100644 (file)
 #include <linux/mtd/physmap.h>
 #include <linux/memory.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
-#include <asm/arch/common.h>
-#include <asm/arch/imx-uart.h>
-#include <asm/arch/iomux-mx3.h>
-#include <asm/arch/board-pcm037.h>
+#include <mach/common.h>
+#include <mach/imx-uart.h>
+#include <mach/iomux-mx3.h>
+#include <mach/board-pcm037.h>
 
 static struct physmap_flash_data pcm037_flash_data = {
        .width  = 2,
index e169b683e4de1c07508c20d9d0841931e733f16e..24c79650f9f359cb0d87c7842f0c3b21db253bd0 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/hardware.h>
+#include <mach/netx-regs.h>
+#include <mach/hardware.h>
 
 struct clk {};
 
index 798ac6e120fff1d736aa090f9caf433531cd4644..1b40483ea753a5af55ff8ec94d5572b004fcddab 100644 (file)
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/vic.h>
 #include <asm/io.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <asm/mach/irq.h>
 
 static struct map_desc netx_io_desc[] __initdata = {
similarity index 94%
rename from include/asm-arm/arch-netx/debug-macro.S
rename to arch/arm/mach-netx/include/mach/debug-macro.S
index a940d0e80cb27c8ecfceed976603f0dbf7c0cc85..11b9d5b46390daf54a2294c1925a832d3ecfb330 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-netx/dma.h
rename to arch/arm/mach-netx/include/mach/dma.h
index 4eda5feed81cc732f670e54044d68d019bdf986a..690b3ebc43acdcf460127c3c56437a8cef019f74 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-netx/entry-macro.S
rename to arch/arm/mach-netx/include/mach/entry-macro.S
index 4115bbdf97aeb79fdb39b4f4764a291c6f87eb2b..a1952a0feda62535d44d288674f05e60e5eb0178 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-netx/eth.h
rename to arch/arm/mach-netx/include/mach/eth.h
index 643c90ef8b723988d0b1e5a02087d5086afd12f6..88af1ac28ead25e878fa357e1e8b4e9f24be20fd 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-netx/hardware.h
rename to arch/arm/mach-netx/include/mach/hardware.h
index 7786c45455cd154f7f3918b424d26a2cd4bebe0f..517a2bd378428740f8ac044d3b7c6c4d7ce36566 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-netx/io.h
rename to arch/arm/mach-netx/include/mach/io.h
index a7a53f80165d31fa33f3022eb431f3239389f410..468b92a825850592daad5da82a4fa2cfc48e76ed 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-netx/irqs.h
rename to arch/arm/mach-netx/include/mach/irqs.h
index a487dc6e266141a358f74819c11a148b13c36d07..6ce914d54a30f922034074a2e8d487ea27f014d7 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-netx/memory.h
rename to arch/arm/mach-netx/include/mach/memory.h
index 6d8d2df3e99db4ae3a759cc1d9bf31898ccfd031..53745a1378de7cb98bdc19710e119f33eef4941e 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-netx/netx-regs.h
rename to arch/arm/mach-netx/include/mach/netx-regs.h
index fc9aa21f360cdc30ee7a20845f36a2c0f15d1cdd..5104a00d40f4c21273f6f7713cf9fbc90793d7d3 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-netx/param.h
rename to arch/arm/mach-netx/include/mach/param.h
index 7a80c26178a88a631aa925010a282a8bbf6387e2..a771459206aa4e6256510c26fed5d367f5ed2e0d 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-netx/pfifo.h
rename to arch/arm/mach-netx/include/mach/pfifo.h
index 4af2ee4a32c1da0fcc9182a9fe4ea8fc9df0a38c..42c59068f8d8fd444f77759544421cc607365d0f 100644 (file)
@@ -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
  *
similarity index 93%
rename from include/asm-arm/arch-netx/system.h
rename to arch/arm/mach-netx/include/mach/system.h
index 0624d87e1db80854c9e9f8630a73f90aa2a9a327..27d8ef8e8e29f0d8f091b467da91f6322cd7c087 100644 (file)
@@ -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)
similarity index 94%
rename from include/asm-arm/arch-netx/timex.h
rename to arch/arm/mach-netx/include/mach/timex.h
index 7fdb42da0b40eef19d8ae27cc0d3825cc375672f..1120dd0ba3933e45f2738cd42faff432dcfcf167 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-netx/uncompress.h
rename to arch/arm/mach-netx/include/mach/uncompress.h
index f89434547102037c331602fbbd29ca7d992be2de..84f91284f6128844366d68b5d77e68a1ae59145f 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-netx/vmalloc.h
rename to arch/arm/mach-netx/include/mach/vmalloc.h
index da2da5a595da47f17286c15cce54200e4d1bbd00..25d5cc676e0fbfa9bbe701f34f925d39ddfe43a2 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-netx/xc.h
rename to arch/arm/mach-netx/include/mach/xc.h
index 659af19512a93faeca889d20412c2bcbeabdca92..0c0011d4fc2d617d8d1351c69f9f4e7a938df964 100644 (file)
@@ -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
  *
index 0cb19450499bed1025916c791c8cc6cc3211b929..c9b174bc8ccfa12b6146eb6a522dc0e7f5b74484 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/eth.h>
+#include <mach/netx-regs.h>
+#include <mach/eth.h>
 
 #include "generic.h"
 #include "fb.h"
index 848b2f172dd8673e5aa86bd2aea3e2be7e046e0c..15b54c62d60f88e6b1348d1be80b2c0365932ed8 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/eth.h>
+#include <mach/netx-regs.h>
+#include <mach/eth.h>
 
 #include "generic.h"
 
index cb361eadba5b390e7538150714ead9dd84912816..1061c01ff679d4d660fff96f2f43670465b7ab54 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/eth.h>
+#include <mach/netx-regs.h>
+#include <mach/eth.h>
 
 #include "generic.h"
 #include "fb.h"
index d0e6b43ff3a029fbb995c8b3fd03bbc2f965df6a..19ae0a72bea391cd22c9d7689a7832dc4e4351da 100644 (file)
@@ -22,9 +22,9 @@
 #include <linux/mutex.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/pfifo.h>
+#include <mach/hardware.h>
+#include <mach/netx-regs.h>
+#include <mach/pfifo.h>
 
 static DEFINE_MUTEX(pfifo_lock);
 
index 2c93fd3d03e5c4393c5c82724c92e63685a4dc90..ac8e5bfed691e0fa43cceb4620567ec99f946cf6 100644 (file)
 #include <linux/irq.h>
 #include <linux/clocksource.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/time.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 /*
  * IRQ handler for the timer
index 0ea4d3baf7b155e8b5b36630eb85c87b71849494..04c34e82fe6d7d172fdfb8754204932fc6cc8fbe 100644 (file)
 #include <linux/mutex.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/hardware.h>
+#include <mach/netx-regs.h>
 
-#include <asm/arch/xc.h>
+#include <mach/xc.h>
 
 static DEFINE_MUTEX(xc_lock);
 
index 46b4f5a2e7f45b7c60424cba289b0f5469a875f5..a22a608a7abaa8a84b1f34e0e5f23981e13bb7cb 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/processor-ns9360.h>
-#include <asm/arch/regs-sys-ns9360.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-bbu.h>
-#include <asm/arch/regs-board-a9m9750dev.h>
+#include <mach/board.h>
+#include <mach/processor-ns9360.h>
+#include <mach/regs-sys-ns9360.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-bbu.h>
+#include <mach/regs-board-a9m9750dev.h>
 
 #include "board-a9m9750dev.h"
 
index 7bc05a4b45b89f0aa1b6e461d0b3ba16ad0c63cb..377330c1b250d69df22be7dec4b1465c252dc49f 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include <asm/arch/regs-bbu.h>
-#include <asm/arch/processor-ns9360.h>
+#include <mach/regs-bbu.h>
+#include <mach/processor-ns9360.h>
 
 #include "gpio-ns9360.h"
 
index ed4c83389d4afd3e0e9e8853e4d6541326fcb2b7..804c300759604db5dacfacf5ab4f17c9d12be330 100644 (file)
@@ -13,9 +13,9 @@
 #include <linux/spinlock.h>
 #include <linux/module.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/processor.h>
-#include <asm/arch/processor-ns9360.h>
+#include <mach/gpio.h>
+#include <mach/processor.h>
+#include <mach/processor-ns9360.h>
 #include <asm/bug.h>
 #include <asm/types.h>
 #include <asm/bitops.h>
similarity index 95%
rename from include/asm-arm/arch-ns9xxx/board.h
rename to arch/arm/mach-ns9xxx/include/mach/board.h
index e57443bdbbd900160bedd722231f94219a85cbff..f7e9196eb9abb2dce89c7c4b9e8048a6cd84ff58 100644 (file)
@@ -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.
similarity index 80%
rename from include/asm-arm/arch-ns9xxx/debug-macro.S
rename to arch/arm/mach-ns9xxx/include/mach/debug-macro.S
index c78908d7203da96b074c21e3d5f37bb2f9c9b07c..c9530fba00aa54866ffdba2372a1324bcd8bea4b 100644 (file)
@@ -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
similarity index 89%
rename from include/asm-arm/arch-ns9xxx/dma.h
rename to arch/arm/mach-ns9xxx/include/mach/dma.h
index a67cbbe009c40598aecf2dea036011b8352913fc..3f50d8c9e5c7eb1594af3c9c56e58a77a827c1ac 100644 (file)
@@ -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.
similarity index 83%
rename from include/asm-arm/arch-ns9xxx/entry-macro.S
rename to arch/arm/mach-ns9xxx/include/mach/entry-macro.S
index e9d9449d300ab1df57ea66dd87140ecb17744c34..71ca0319b547038ec7b8b9df176c02145ec498fb 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-ns9xxx/gpio.h
rename to arch/arm/mach-ns9xxx/include/mach/gpio.h
index adbca08583c0d36aeff5e251903aeef63c1d9c1a..5eb349032579b0dd6c1cf9474c147af26ff0c2e0 100644 (file)
@@ -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.
similarity index 97%
rename from include/asm-arm/arch-ns9xxx/hardware.h
rename to arch/arm/mach-ns9xxx/include/mach/hardware.h
index 0dca11ce21fcfdeac2636b5c46424a13c37905c5..6dbb2030f5631b3c6e2dbf0abdd5d9a331383745 100644 (file)
@@ -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.
similarity index 92%
rename from include/asm-arm/arch-ns9xxx/io.h
rename to arch/arm/mach-ns9xxx/include/mach/io.h
index 6f82d28af1201fffe97316ab09a3c774e1346ffa..027bf649645adfc738dda0224dc856e0725f6a53 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-ns9xxx/irqs.h
rename to arch/arm/mach-ns9xxx/include/mach/irqs.h
index e83d48ec42c9baab2b2bc9d8554462976d5e3a33..13483949e210b9d2710ae1207aa8377c2ca688be 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/arch-ns9xxx/memory.h
rename to arch/arm/mach-ns9xxx/include/mach/memory.h
index ce1343e593e1661b70c1c5d819f815c5b87ecba5..649ee6235b943404161d7325d8c9025f9a3acb6b 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-ns9xxx/module.h
rename to arch/arm/mach-ns9xxx/include/mach/module.h
index ac08a31111e4a3f6db7c098230bb2723d3efea80..f851a6b7da6cbfed57aab8f073844cba3704345c 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/arch-ns9xxx/processor-ns9360.h
rename to arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
index f3aa6c50dbe57edefb962f43dd296ee1f8391d3a..f41deda5129e4b6cc588e10f3f51064074b86bd4 100644 (file)
@@ -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.
similarity index 92%
rename from include/asm-arm/arch-ns9xxx/processor.h
rename to arch/arm/mach-ns9xxx/include/mach/processor.h
index 3137e5ba01a9fa9501ec95a8744b8a288878d186..9f77f746a386b386587bac821833d22cfd1c33d8 100644 (file)
@@ -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()                \
similarity index 95%
rename from include/asm-arm/arch-ns9xxx/regs-bbu.h
rename to arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
index b41b31d04f03911a7ebcdb99f16619087bbe8deb..af227c058fb9b118937665e910d0604881e12ee9 100644 (file)
@@ -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 */
 
similarity index 89%
rename from include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h
rename to arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
index 6bf1ed2ac3d2882b4c470046000fccc67d29edd0..cd1593693f561460f2b663c5168dce4bb9ee5fd0 100644 (file)
@@ -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)
similarity index 98%
rename from include/asm-arm/arch-ns9xxx/regs-mem.h
rename to arch/arm/mach-ns9xxx/include/mach/regs-mem.h
index 023f7be6f4c6b5262bbc70cc747f1d01932f176a..f1625bf8cdce6b12f78e56ba61514a2af749a248 100644 (file)
@@ -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 */
 
similarity index 90%
rename from include/asm-arm/arch-ns9xxx/regs-sys-common.h
rename to arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
index bc82d5ec2a880919bcd01c85a9732a96289e3657..14f91dfd5736bf636c89ef19aa200c78e5eb7722 100644 (file)
@@ -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))
similarity index 98%
rename from include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h
rename to arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
index 821275a88cb1f58114ca557b8a8cf0aba94c228d..8ff254d9901c3bb3c3d577b32febd7bcf5e9e783 100644 (file)
@@ -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 */
 
similarity index 84%
rename from include/asm-arm/arch-ns9xxx/system.h
rename to arch/arm/mach-ns9xxx/include/mach/system.h
index c2941684d667b7db97233dbcb589bb593883bee6..e2068c57415fd17440e4503763f4b1cb5412c957 100644 (file)
@@ -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)
 {
similarity index 77%
rename from include/asm-arm/arch-ns9xxx/timex.h
rename to arch/arm/mach-ns9xxx/include/mach/timex.h
index f776cbd2622dcfaa29546a5eda99af13317d538d..734a8d8bd578885f1f3c0ceb6decb3134d57e4e7 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-ns9xxx/uncompress.h
rename to arch/arm/mach-ns9xxx/include/mach/uncompress.h
index 71066baceab7eacb8fa6dbdd6cc3e14a61dcf1f9..5dbc3c5167c89e1539a4f2b44672a9a0d9279f1e 100644 (file)
@@ -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.
similarity index 89%
rename from include/asm-arm/arch-ns9xxx/vmalloc.h
rename to arch/arm/mach-ns9xxx/include/mach/vmalloc.h
index 2f3cb6f6be2414a42dd5bf5bfb3a6c58287e61cf..fe964d3bcc477d9710c6929f8a41d3da6fc52f08 100644 (file)
@@ -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.
index 96de8ebed41d20a23450eabf4532a7835c0a9952..38260d5f849b3e482935e27e615d7364c909ff22 100644 (file)
@@ -12,9 +12,9 @@
 #include <linux/kernel_stat.h>
 #include <asm/io.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/regs-sys-common.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/board.h>
+#include <mach/regs-sys-common.h>
+#include <mach/irqs.h>
+#include <mach/board.h>
 
 #include "generic.h"
 
index 7714233fb0048f7beec9a9ead2af0ead613fba9c..2858417d8d8aea49c1248633afd95c38b70f41b9 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/processor-ns9360.h>
+#include <mach/processor-ns9360.h>
 
 #include "board-a9m9750dev.h"
 #include "generic.h"
index bdbd0bb1a0b33ebd369a1fde2a9375bb56940963..729f68da4293f476cb29a4ed4f89c4e7bd9bb3eb 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/processor-ns9360.h>
+#include <mach/processor-ns9360.h>
 
 #include "board-jscc9p9360.h"
 #include "generic.h"
index c9cce9b4e6c96810783faf02f7f9980d4befa35e..795b15e8982a6e88e8742a186bcfb11e8d66e765 100644 (file)
@@ -11,8 +11,8 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 
-#include <asm/arch/regs-board-a9m9750dev.h>
-#include <asm/arch/board.h>
+#include <mach/regs-board-a9m9750dev.h>
+#include <mach/board.h>
 
 #define DRIVER_NAME "serial8250"
 
index 8ee81b59b35d3a2464ec95e1306200a9328ba90d..abee8338735d471884dc057cfac76b3e5cab4790 100644 (file)
@@ -14,8 +14,8 @@
 
 #include <asm/page.h>
 #include <asm/mach/map.h>
-#include <asm/arch/processor-ns9360.h>
-#include <asm/arch/regs-sys-ns9360.h>
+#include <mach/processor-ns9360.h>
+#include <mach/regs-sys-ns9360.h>
 
 void ns9360_reset(char mode)
 {
index 66bd58262974f5f376341546d7bfbe27d66e50d6..a63424d083d95186f7b5aabbe5c55cbc4b1302ad 100644 (file)
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 
-#include <asm/arch/processor-ns9360.h>
-#include <asm/arch/regs-sys-ns9360.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/system.h>
+#include <mach/processor-ns9360.h>
+#include <mach/regs-sys-ns9360.h>
+#include <mach/irqs.h>
+#include <mach/system.h>
 #include "generic.h"
 
 #define TIMER_CLOCKSOURCE 0
index 46488c276654c69299945b9652639c8bf175914c..2e618391cc51b88be86d46dbb5f31816a2d1fd18 100644 (file)
 #include <linux/input.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/board-ams-delta.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
+#include <mach/board-ams-delta.h>
+#include <mach/gpio.h>
+#include <mach/keypad.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/common.h>
 
 static u8 ams_delta_latch1_reg;
 static u16 ams_delta_latch2_reg;
index 8583e80a3ca97d976af5b379518bbfebaf6fef6f..db789461fca49ed3b38530daa05d779320f1dd13 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/tc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
-#include <asm/arch/nand.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/board.h>
-#include <asm/arch/board-fsample.h>
+#include <mach/tc.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/fpga.h>
+#include <mach/nand.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/board.h>
+#include <mach/board-fsample.h>
 
 static int fsample_keymap[] = {
        KEY(0,0,KEY_UP),
index d90266243134345ff5d8bfa5e18faad36f899078..7d26702053739003e08f086261e37bf7db17dcb1 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/common.h>
 
 static void __init omap_generic_init_irq(void)
 {
index 6fdc78406b21f2b8ef47d0b598d7886dc409eb1c..ab9ee5820c489f935784fa1148764190ede72fdf 100644 (file)
@@ -12,8 +12,8 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/mmc.h>
-#include <asm/arch/gpio.h>
+#include <mach/mmc.h>
+#include <mach/gpio.h>
 
 #ifdef CONFIG_MMC_OMAP
 static int slot_cover_open;
index f69e3b5ad54608e71311885744acf65976a78ce8..3b65914b9141c79b3dab4d5936537a265dab7adc 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/input.h>
 #include <linux/i2c/tps65010.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/gpio.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio-switch.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/nand.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/gpio-switch.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <mach/nand.h>
+#include <mach/irda.h>
+#include <mach/usb.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 static int h2_keymap[] = {
        KEY(0, 0, KEY_LEFT),
index 66ecc437928f98d13f0270c7a61691ac2175781b..36085819098cbdd687665e42946fd0bfcb8a125c 100644 (file)
@@ -12,8 +12,8 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/mmc.h>
-#include <asm/arch/gpio.h>
+#include <mach/mmc.h>
+#include <mach/gpio.h>
 
 #ifdef CONFIG_MMC_OMAP
 static int slot_cover_open;
index 1ae3826e27c110bb5d94e830e81158268abd3d07..2ced6d9984d27802844a448aa37720f54889d62a 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <asm/setup.h>
 #include <asm/page.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/gpio.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpioexpander.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/nand.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/gpioexpander.h>
+#include <mach/irqs.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <mach/nand.h>
+#include <mach/irda.h>
+#include <mach/usb.h>
+#include <mach/keypad.h>
+#include <mach/dma.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 #define H3_TS_GPIO     48
 
index 667c7204f8231482d782bcba3b9abf707d4b118b..cbc11be5cd2a9ebcbc1fc43f82308f17c969076c 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/mux.h>
+#include <mach/fpga.h>
+#include <mach/gpio.h>
+#include <mach/tc.h>
+#include <mach/usb.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 static int innovator_keymap[] = {
        KEY(0, 0, KEY_F1),
index 2826214d35179166c770cd07e1513d33bcec11f9..38d9783ac6d6fe420972df38f2b3fb4993ec8440 100644 (file)
 #include <linux/workqueue.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/dsp_common.h>
-#include <asm/arch/aic23.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/lcd_mipid.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/dsp_common.h>
+#include <mach/aic23.h>
+#include <mach/omapfb.h>
+#include <mach/lcd_mipid.h>
 
 #define ADS7846_PENDOWN_GPIO   15
 
index 4d8cd9fcb69076764adbc31b9839094975f72cf7..3e766e49f7cc05faced8c31b01150a56e8fe1471 100644 (file)
@@ -39,7 +39,7 @@
 
 #include <linux/i2c/tps65010.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/gpio.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/usb.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/usb.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 static struct mtd_partition osk_partitions[] = {
        /* bootloader (U-Boot, etc) in first sector */
@@ -340,7 +340,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
-#include <asm/arch/keypad.h>
+#include <mach/keypad.h>
 
 static const int osk_keymap[] = {
        /* KEY(col, row, code) */
index 6855255f5c64cba3c7a30952a327227c2b065689..b58043644a6f55681ba5c66cb1d3a47f03687116 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/apm-emulation.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/board.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/tc.h>
+#include <mach/dma.h>
+#include <mach/board.h>
+#include <mach/irda.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 static void __init omap_palmte_init_irq(void)
 {
index 96896f83b5f40f627eef965af46db4a1ed6b9bee..40f9860a09df243147c87ce320fa41588ffe0dfc 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/leds.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/led.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/led.h>
+#include <mach/mcbsp.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/dma.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/irda.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/omap-alsa.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
index b8ccdb2050024f24a586b7e50c4b3afee39f783d..e719294250b1f5dedf0bbec0a486ee855caf536d 100644 (file)
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/mcbsp.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/dma.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/irda.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/omap-alsa.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
index 9857fc9e1563c430e1deebe7b69c2a6ae8b9268f..b715917bfdaf89852fac68e6715314205fadbc3b 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/tc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
-#include <asm/arch/nand.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/common.h>
-#include <asm/arch/board.h>
+#include <mach/tc.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/fpga.h>
+#include <mach/nand.h>
+#include <mach/keypad.h>
+#include <mach/common.h>
+#include <mach/board.h>
 
 static int p2_keymap[] = {
        KEY(0,0,KEY_UP),
index 8c93d47719e872fe3c88becb983386b482c51753..0be4ebaa2842a120e2be29e96ce8906ec32fb105 100644 (file)
@@ -12,9 +12,9 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>
+#include <mach/mmc.h>
+#include <mach/gpio.h>
 
 #ifdef CONFIG_MMC_OMAP
 static int slot_cover_open;
index 0c2c42b2ec6ddcc685419aa6ce5d60cdd271b0c4..130bcc6fd082b4a7fa5745e3bb0d3c27b059f68b 100644 (file)
 #include <linux/i2c.h>
 #include <linux/errno.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
-#include <asm/arch/keypad.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/irda.h>
+#include <mach/usb.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/common.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
+#include <mach/keypad.h>
 
 /* Write to I2C device */
 int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)
index 902b12ed8c13fec5e5ee8c66768220360bed2884..213b48787102bf461ae30134907cd2fab0089127 100644 (file)
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/usb.h>
+#include <mach/common.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
+#include <mach/usb.h>
 
 static struct plat_serial8250_port voiceblue_ports[] = {
        {
index 4ea2933f887d1e12485354b8b042663ae6238420..5965cf09f8c4ab57b875fec102752c1779cad1b1 100644 (file)
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/cpu.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/cpu.h>
+#include <mach/usb.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 
 #include "clock.h"
 
index 9ad8f927ef13800e43ef201517b70ca5074c8398..ab708d4c597e85e3aa0e1ac844995ac1c7d87bc8 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
 
 /*-------------------------------------------------------------------------*/
 
index b9649c75836dd53917f317f31a7ced8ea7607513..4449d86095f673f554749cd22da2ccc876ded894 100644 (file)
 #include <linux/device.h>
 #include <linux/errno.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/gpio.h>
+#include <mach/fpga.h>
+#include <mach/gpio.h>
 
 static void fpga_mask_irq(unsigned int irq)
 {
index 81c4e738506c865430c27534755cde6780d01a19..2b9750b200ce9068a1fa069cc677da9284e2f78b 100644 (file)
@@ -15,8 +15,8 @@
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
 #include <asm/io.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
 
 extern int omap1_clk_init(void);
 extern void omap_check_revision(void);
index 061f073265f763ea0ac5cabf588e5d37060816f8..0ec6c1ec42507300166b158bcafba69f6d6dd0a7 100644 (file)
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/cpu.h>
+#include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include <asm/io.h>
 
index c9e894a66e26b27844b35e610b1d2526d94e96d7..610f51f18741935598ef5aa7a92e7c8415c0ee01 100644 (file)
 #include <linux/sched.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/gpio.h>
+#include <mach/fpga.h>
+#include <mach/gpio.h>
 
 #include "leds.h"
 
index 82eacb005e2f408b407a96ee105d11a57fbb8fd1..9b99c28946239c89c473823295055857acc11909 100644 (file)
@@ -3,7 +3,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
index 1cd94e0c9b3d4b9d861ffa41516b68567d198987..98e789622dfd753c69522f3cd1e4d25204838d2b 100644 (file)
@@ -5,11 +5,11 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #include "leds.h"
 
index 3f9dcac4fd41abbee1b17346ffee28d06346f8ad..6cdad93c4a0031732e31fe757f425c7cf91a545b 100644 (file)
@@ -9,8 +9,8 @@
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
 
 #include "leds.h"
 
index bad1e7152d8eb43b83ba74094ef085011ed2a6a1..af44eab1ed24ac1e77791d85d387485cfe5db7d9 100644 (file)
@@ -13,8 +13,8 @@
 #include <linux/resource.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/irqs.h>
+#include <mach/mailbox.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 
 #define MAILBOX_ARM2DSP1               0x00
index 2d2c2522b0480845aae975653b70164fa773e577..826010d5d014f26f96df045d7e195c6359b9c997 100644 (file)
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
+#include <mach/cpu.h>
+#include <mach/mcbsp.h>
+#include <mach/dsp_common.h>
 
 #define DPS_RSTCT2_PER_EN      (1 << 0)
 #define DSP_RSTCT2_WD_PER_EN   (1 << 1)
index e207bf7cb8537aa0c8f89d2664276604a3e9c848..898516e362e7716e5a15f3a8d669812de294225b 100644 (file)
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 #ifdef CONFIG_OMAP_MUX
 
index bb06de92daee0b79646678918d0f81e58c5d3189..63c4ea18b1ca20de07559cd5370120da72cc5fc6 100644 (file)
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/cpu.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/cpu.h>
+#include <mach/irqs.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
+#include <mach/tc.h>
+#include <mach/pm.h>
+#include <mach/mux.h>
+#include <mach/dma.h>
+#include <mach/dmtimer.h>
 
 static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];
 static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE];
index 10a4fe88b2fd5993a9b8d262f63f9aea4dca5381..0e25a996bb4c17d65d02231bdb996647e56634f1 100644 (file)
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/fpga.h>
+#include <mach/board.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/fpga.h>
 #ifdef CONFIG_PM
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 #endif
 
 static struct clk * uart1_ck;
index 68f5b39030b67680093f5bd3bdf167c811864c49..f3eac932092da1068acdb6bbf7e3e7da86ac122d 100644 (file)
@@ -34,8 +34,8 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/pm.h>
+#include <mach/io.h>
+#include <mach/pm.h>
 
                .text
 
index 776c89c7c5a4ce0035a64f9b8ac6992ac0ca3d05..261cdc48228b638541de1302a0b0dc3dc457b536 100644 (file)
@@ -10,8 +10,8 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/io.h>
+#include <mach/hardware.h>
 
        .text
 
index ae8910381e3bab6326f53441704f10d49fd3c386..e54708595ecf4db14187579560a2b5476c9866ce 100644 (file)
@@ -45,7 +45,7 @@
 #include <linux/clockchips.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
index f358fe9548f3c0a6bc9442dd813c39e7fb3f0f0a..e67760189d14c10120f693f0fb341dfb28b7bdab 100644 (file)
 #include <linux/clockchips.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/dmtimer.h>
 
 struct sys_timer omap_timer;
 
index 8911f8e675c479c9f9720db558486a3e331c7b74..d4d6385cad7c7e3275370f8f67138c1a9398b1a5 100644 (file)
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/board.h>
+#include <mach/common.h>
+#include <mach/gpmc.h>
 
 #include <asm/io.h>
 
index 170c9681d0939c805b7c6c9cee0ebfeb4891a171..989ad152d7f87105c6b02a1ea4bf0c7fdbc3cd00 100644 (file)
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/led.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/control.h>
+#include <mach/gpio.h>
+#include <mach/led.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/common.h>
+#include <mach/gpmc.h>
+#include <mach/control.h>
 
 /* LED & Switch macros */
 #define LED0_GPIO13            13
index 68ec3a32387a35c64939d061e2e09e16a1991008..9ba097868e72b78657a3608ef79fef647276b166 100644 (file)
 #include <linux/init.h>
 #include <linux/device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
+#include <mach/common.h>
 
 static void __init omap_generic_init_irq(void)
 {
index a32b475dc09c34ff75deaae5ef57a84fcc7f0159..9e2624ca70a2493cb0320d0373d446e91d1526da 100644 (file)
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/control.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/gpioexpander.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/menelaus.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/gpmc.h>
+#include <mach/control.h>
+#include <mach/gpio.h>
+#include <mach/gpioexpander.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/irda.h>
+#include <mach/board.h>
+#include <mach/common.h>
+#include <mach/keypad.h>
+#include <mach/menelaus.h>
+#include <mach/dma.h>
+#include <mach/gpmc.h>
 
 #include <asm/io.h>
 
index 15675bce801207929b01a0a5978472ec3bf98d7b..1d891e4a69337d76aba8a75cb931e58477935161 100644 (file)
@@ -25,9 +25,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/cpu.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
+#include <mach/cpu.h>
 #include <asm/div64.h>
 
 #include "memory.h"
index 3cd37cb57c5a562955351a980f58615ee4bc4f38..626e5fa93b6ad3a9fd6e79164d9092dc29c4935d 100644 (file)
@@ -16,7 +16,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H
 #define __ARCH_ARM_MACH_OMAP2_CLOCK_H
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 /* The maximum error between a target DPLL rate and the rounded rate in Hz */
 #define DEFAULT_DPLL_RATE_TOLERANCE    50000
index aa567876651d4d81ea7e86218ab415b4aff6d7eb..295e671e9cfdbcb397560cac97d881960077c07c 100644 (file)
@@ -28,8 +28,8 @@
 #include <linux/io.h>
 #include <linux/cpufreq.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 #include <asm/div64.h>
 #include <asm/bitops.h>
 
index 4263099b1ad3defa11c4f077a5e9d33f9c2c5655..3ff74952f8354658d310654fa32c894f3e6c2475 100644 (file)
@@ -26,8 +26,8 @@
 #include <linux/io.h>
 #include <linux/limits.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 #include <asm/div64.h>
 #include <asm/bitops.h>
 
index 05757eb032bca4f62e86ffd57d99cbcc67af922e..ec664457a11a964b88b5f7cf8dd10d882f082588 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
 #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
 
-#include <asm/arch/control.h>
+#include <mach/control.h>
 
 #include "clock.h"
 #include "cm.h"
index 51f70300996f6cc91c11bd2cdb61a266f9fd46b4..5f3aad9778426fb575e437823335346c5a477957 100644 (file)
@@ -15,8 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/control.h>
+#include <mach/common.h>
+#include <mach/control.h>
 
 static void __iomem *omap2_ctrl_base;
 
index a6acdcdbb63c5e7120e4d994a6c2932e53d29a03..7a7f02559075fc9ce8538c5f64d26c538ef03bc3 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
 
 #if    defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
@@ -142,7 +142,7 @@ static inline void omap_init_sti(void) {}
 
 #if defined(CONFIG_SPI_OMAP24XX)
 
-#include <asm/arch/mcspi.h>
+#include <mach/mcspi.h>
 
 #define OMAP2_MCSPI1_BASE              0x48098000
 #define OMAP2_MCSPI2_BASE              0x4809a000
index dbf68dc50ae2fa1502a21edea0eba88dbee4b52b..f51d69bc457dac2be97ff36c81ed4e037155c67c 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
 
 #undef DEBUG
 
index dff4b16cead662f53b7aafeea6aa5fd8efe00e39..a5d4526ac4d6debdb1f0a0e0393bc37443e00bac 100644 (file)
@@ -17,8 +17,8 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/control.h>
-#include <asm/arch/cpu.h>
+#include <mach/control.h>
+#include <mach/cpu.h>
 
 #if defined(CONFIG_ARCH_OMAP2420)
 #define TAP_BASE       io_p2v(0x48014000)
index 69c8174f3aace0f5b377021e347e7785800ef1cb..987351f07d7b618bb0a10ea12a2d18001a9415e4 100644 (file)
@@ -21,8 +21,8 @@
 
 #include <asm/mach/map.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
 
 extern void omap_sram_init(void);
 extern int omap2_clk_init(void);
index 6d4c4bf82ad5c038b187d7ee30fb3f482f0eea61..9ef15b31d8fcc4f8c0b62167ef889685905fcbd1 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
 #include <asm/io.h>
index 4799561c5a9ec048f46bdfb9cf53d437c04e82ff..a480b96948e48ad66b50a1ba6798983c2890d2eb 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/irqs.h>
+#include <mach/mailbox.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 
 #define MAILBOX_REVISION               0x00
index 17cf199d113005dd24981bba01efe2a7a5b9e7b4..27eb6e3ca92622d98111b2d9bb030837541e1b30 100644 (file)
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
+#include <mach/cpu.h>
+#include <mach/mcbsp.h>
 
 struct mcbsp_internal_clk {
        struct clk clk;
index 73cadb2c75cf4fe1bfb6ba9097b806917865a42b..6b49cc9cbdcbcb31a03e674524cd27eb26e4139e 100644 (file)
@@ -24,9 +24,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/common.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 
 #include "prm.h"
 
index 8f98b20f30a1655d70adbe4523b7034463e89a1a..443d07fef7f3155ee06b9e877d17d7286cd3b43c 100644 (file)
@@ -29,8 +29,8 @@
 #include <asm/io.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/control.h>
-#include <asm/arch/mux.h>
+#include <mach/control.h>
+#include <mach/mux.h>
 
 #ifdef CONFIG_OMAP_MUX
 
index 5e6e595d8eff7d3276118eb64752cb5e0b5d17f3..8671e1079ab54c7764adfe729294e793e9504d17 100644 (file)
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/irqs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/pm.h>
+#include <mach/irqs.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
+#include <mach/pm.h>
 
 static struct clk *vclk;
 static void (*omap2_sram_idle)(void);
index fd92a80f38f23045b0c8eeaababb6da1bd1bfae2..f945156d55859cbf97e0f70f9f917c7d2630107f 100644 (file)
@@ -18,8 +18,8 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/prcm.h>
+#include <mach/common.h>
+#include <mach/prcm.h>
 
 #include "clock.h"
 #include "prm.h"
index 1b1fe4f6e030c15df54db2126340f7a945f23e4e..1a8bbd094066acd7ae0cc5a4ca56b7bc58fc93c3 100644 (file)
@@ -15,7 +15,7 @@
  */
 #undef DEBUG
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 
 #ifndef __ASSEMBLER__
 extern void __iomem *omap2_sdrc_base;
index e9c367fc9f613c96723820cc7e0fd10d7fde421f..adc8a26a8fb01757ee6f18ced5104ac9db1edaa8 100644 (file)
@@ -20,8 +20,8 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/board.h>
+#include <mach/common.h>
+#include <mach/board.h>
 
 static struct clk * uart1_ick = NULL;
 static struct clk * uart1_fck = NULL;
index 46ccb9b8b583e166789a50baf25005ed219c57a5..87a706fd5f8214f13fb1c9894f9f344161b6a3ed 100644 (file)
@@ -23,8 +23,8 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/pm.h>
+#include <mach/io.h>
+#include <mach/pm.h>
 
 #include "sdrc.h"
 
index 229a9284ed901f8749160c82b58ec6a8637e8beb..af4bd3490227feddda1cca44702bc32eb03caf6b 100644 (file)
@@ -24,8 +24,8 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/io.h>
+#include <mach/hardware.h>
 
 #include "prm.h"
 #include "cm.h"
index 1665ebb9d7ce074c4bc38eea1aa358434f227463..84363e269e8cd7fca6418765786074e4db5e2967 100644 (file)
@@ -24,8 +24,8 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/io.h>
+#include <mach/hardware.h>
 
 #include "prm.h"
 #include "cm.h"
index 557603f99313c9dcf4fef5632fef4c3546ecd892..589393bedade0477dbecb909d5fd82501a58203c 100644 (file)
@@ -34,7 +34,7 @@
 #include <linux/clockchips.h>
 
 #include <asm/mach/time.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/dmtimer.h>
 
 static struct omap_dm_timer *gptimer;
 static struct clock_event_device clockevent_gpt;
index 80bb42eb50826acb895ab30de2781e22ff6f8598..1607c941d95fd0848d12eaf202b17a794066f25c 100644 (file)
@@ -15,9 +15,9 @@
 
 #include <linux/usb/musb.h>
 
-#include <asm/arch/gpmc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/gpmc.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
 
 
 static u8              async_cs, sync_cs;
index 9a3cc006836228d9b03989b53b90fd20034613f0..bea37972120a9187a61d93bd5c29b94bd5e584e6 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mbus.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include "common.h"
 
index faf4e32119180563718b7f8a9751e760c429a703..168eeacaa4c0fdc3b92aa85e0d7e926ddcbd96dd 100644 (file)
@@ -24,8 +24,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/orion5x.h>
+#include <mach/hardware.h>
+#include <mach/orion5x.h>
 #include <asm/plat-orion/ehci-orion.h>
 #include <asm/plat-orion/orion_nand.h>
 #include <asm/plat-orion/time.h>
index 40a0bee4fbb3da6159625ff5c34e7b4236710b30..48ce6d0e002082f15e4090afa954354d3c8bcdd3 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 #include "mpp.h"
index 3791ca6f001a641861aa13aa27d0bd09557ae28a..1a1d84b80a6521bed1de34ded745db7a643f0ac8 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index d09797990f418b3a9f99ec4088c46024abfa3ba6..cd8a16f67d2be6540daac0e2cc86206ad229791b 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/bitops.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 
 static DEFINE_SPINLOCK(gpio_lock);
similarity index 85%
rename from include/asm-arm/arch-orion5x/debug-macro.S
rename to arch/arm/mach-orion5x/include/mach/debug-macro.S
index 4f98f3ba2929e59dcc427769a46ae76cf17d6cf4..c7f808bfe272fa1caa477182e91cb566ff9b2c4a 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-orion5x/entry-macro.S
rename to arch/arm/mach-orion5x/include/mach/entry-macro.S
index d8ef54c0ee9abdce2ee30ec2d30a866fccd35b0f..4351937035cd5415c97a38db47dbf4a4c15de60e 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-orion5x/gpio.h
rename to arch/arm/mach-orion5x/include/mach/gpio.h
index c85e498388b60c1b8ed201c6fa4534ea2eb41ccf..65dc136a86f70e22de74ad1e3d2267498fb2ad42 100644 (file)
@@ -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
similarity index 90%
rename from include/asm-arm/arch-orion5x/hardware.h
rename to arch/arm/mach-orion5x/include/mach/hardware.h
index 5d2d8e0b5630c8d3852598402569ef8768ff1d12..e51aaf4bf2b5f8ef4db0907d3b3d4bb45f4b0a72 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-orion5x/io.h
rename to arch/arm/mach-orion5x/include/mach/io.h
index 59f1bc96a23b7a803287cf6719b4489921043fa1..f24b2513f7f366d896bf016bd81bf9b3dd7eee56 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-orion5x/io.h
+ * arch/arm/mach-orion5x/include/mach/io.h
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
similarity index 97%
rename from include/asm-arm/arch-orion5x/irqs.h
rename to arch/arm/mach-orion5x/include/mach/irqs.h
index abdd61a4833a7a1a0b8d425edbc98e56d91464e5..d5b0fbf6b9657f1f6a4f79909c8902dd64ccd9d1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-orion5x/irqs.h
+ * arch/arm/mach-orion5x/include/mach/irqs.h
  *
  * IRQ definitions for Orion SoC
  *
similarity index 83%
rename from include/asm-arm/arch-orion5x/memory.h
rename to arch/arm/mach-orion5x/include/mach/memory.h
index 80053a7afc7abd9418b221ae25dbd6c178f66b03..54dd76b013f266f4d5abc0fe1818630990168c27 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-orion5x/memory.h
+ * arch/arm/mach-orion5x/include/mach/memory.h
  *
  * Marvell Orion memory definitions
  */
similarity index 99%
rename from include/asm-arm/arch-orion5x/orion5x.h
rename to arch/arm/mach-orion5x/include/mach/orion5x.h
index 10257f5c5e9ecb1151674eb7eecc5b0541e16a40..f52a7d65bec2fbe1769883d051112387b4e70bff 100644 (file)
@@ -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.
similarity index 83%
rename from include/asm-arm/arch-orion5x/system.h
rename to arch/arm/mach-orion5x/include/mach/system.h
index 3f1d1e2d38f8ae53ae88396e59ddde35f2f193f1..08e430757890d984171f7dffa99953e69ea74a9e 100644 (file)
@@ -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)
 {
similarity index 87%
rename from include/asm-arm/arch-orion5x/timex.h
rename to arch/arm/mach-orion5x/include/mach/timex.h
index 31c568e28cc33a7b66374e25a2e0fbe5e056bbc7..e82e44db7629fa2d523ae72d1192b19b326f632f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-orion5x/timex.h
+ * arch/arm/mach-orion5x/include/mach/timex.h
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
similarity index 91%
rename from include/asm-arm/arch-orion5x/uncompress.h
rename to arch/arm/mach-orion5x/include/mach/uncompress.h
index 7548cedf2d76ff0e2be2438bd5356aed50ee3778..4322dba468a4f30cce2c49d8a799c140e6bf2cc4 100644 (file)
@@ -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/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..7147a29
--- /dev/null
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-orion5x/include/mach/vmalloc.h
+ */
+
+#define VMALLOC_END       0xfd800000
index 9ae3f6dc7839cb9f1285f5990dbd133e97b73f68..cc2a017fd2a980b27a7131c59c9577cdc2765e87 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/irq.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include <asm/plat-orion/irq.h>
 #include "common.h"
 
index 84feac4a1fe22825b8256eb42852b4abec67bae4..0caaaac74bc18fb975f8b29faf77e927ba76680a 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 #include "mpp.h"
index 8eadc9b5b0a537fddca8285d14def31ed86bf95c..c04ab0e16ea1e8b66d1a3678de2e7a200fbdb194 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mbus.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include "common.h"
 #include "mpp.h"
index 7ce9e407d9d18860d49edb85791c180a5090f60a..4403cc963d665be504d2eee536dccb979bfe8dfb 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 55f3b0fdef8b21cf1ee01d2880bf5fd7ebba21e4..67b2c0df615fbe58c7f0621d990930e468af84ef 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 73e9242da7ad3e0973d3373f98ccc83dd85690eb..e72fe1e065e825069547e166763f33adaf32b3b1 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/leds.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index ac482019abbfbf8b656245b9373e95bca102a6e1..a1fe3257320d77732c121eeb9b7c07b25557909e 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/leds.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 2a46d27209c198ad472a62c2aafb220bfbaa97d1..8771cb76f0dca72c5b31681ebb82b36170bc8ec8 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/leds.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index f270ada2def93b1b4ad5e308c4c641a534986b39..809132de31d213d2177e5e8de031a749f863e5fc 100644 (file)
@@ -26,7 +26,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 #include "tsx09-common.h"
index 32f0ff073b7e35771c3fa816a4264ea3094f721f..6053e76ac9672784c0df15315d05ee2dc6faf2bd 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 #include "tsx09-common.h"
index 77e9f351f07ab3b6936534f9733083b41a2e1dc8..014916a28fdcc31b1db03f97d2f672b4b2e0ba76 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 25568c2a3d298076b17c5dd332223c778f633edd..b6bc43e07eed1cce12d21dd0cfdb8cadeb4537ae 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 9b8ee8c48bf013454b90678c4a44264eba02975c..b10da17b3fbdc0dc8842df785a23f7dbcc5db089 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/gpio.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"
 
index 576e9a4d21e05b53cfb98afe7e6b45d3c07c9c15..24d036a24a72b7f8c9ce37749d4434881497c6ea 100644 (file)
 #include <linux/err.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include "clock.h"
 
 /*forward declaration*/
index 156d8faa356012b4b8dbd9ad7ab44a8912581e8e..3ba46ede9bbd45eec322bc5d7ddae8798638e85e 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/device.h>
 #include <linux/spi/spi.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -38,9 +38,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/irq.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/dma.h>
+#include <mach/irq.h>
+#include <mach/clock.h>
+#include <mach/dma.h>
 
 struct resource spipnx_0_resources[] = {
        {
index fee0d252854e12c6f1291490688b6fab2bf68911..833c56be73449766b601e541a893d12af28f0de3 100644 (file)
 #include <linux/clk.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 #include <asm/dma-mapping.h>
 #include <asm/io.h>
 #include <asm/mach/dma.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 static struct dma_channel {
        char *name;
index ef179cab80e2133ed71f8f3bf7fa92a4da6d188b..fb51f7279e951ae3f5ff5b6cfeb5ba6c113876eb 100644 (file)
@@ -18,8 +18,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/arch/platform.h>
-#include <asm/arch/gpio.h>
+#include <mach/platform.h>
+#include <mach/gpio.h>
 
 /* register definitions */
 #define PIO_VA_BASE    IO_ADDRESS(PNX4008_PIO_BASE)
index 6f308827c4fe32382667aa8565a8d019abc32a4f..87c093286ff930eb079a0f1b9b5a1f88867ac1dc 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/i2c-pnx.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
-#include <asm/arch/platform.h>
-#include <asm/arch/i2c.h>
+#include <mach/platform.h>
+#include <mach/i2c.h>
 
 static int set_clock_run(struct platform_device *pdev)
 {
similarity index 97%
rename from include/asm-arm/arch-pnx4008/clock.h
rename to arch/arm/mach-pnx4008/include/mach/clock.h
index ce155e1612690dbf7671f9c0d95a20aa9ef0ac51..8d2a5ef52c90ea1f34bc1eb9c3029c77b525e9af 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-pnx4008/debug-macro.S
rename to arch/arm/mach-pnx4008/include/mach/debug-macro.S
index 67d18a203d23a302b8a64ef9378181d1b13a3d7d..6d1407f319f8281fc780f34e64037e42cb5ea09c 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-pnx4008/dma.h
rename to arch/arm/mach-pnx4008/include/mach/dma.h
index 418f15283ff1539efbaf564ac8ac42754e74c623..5442d04fc57536188103dbb1a98a707bbc9d8ca2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-pnx4008/dma.h
+ *  arch/arm/mach-pnx4008/include/mach/dma.h
  *
  *  PNX4008 DMA header file
  *
similarity index 98%
rename from include/asm-arm/arch-pnx4008/entry-macro.S
rename to arch/arm/mach-pnx4008/include/mach/entry-macro.S
index f11731974e5d5a2b2b3123783b16cb8b7bc19375..8003037578ed89c4d8807933ed7052e3f011097c 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-pnx4008/gpio.h
rename to arch/arm/mach-pnx4008/include/mach/gpio.h
index d01bf83d55c2625e997225e90261bc86e81de6cd..9591467eb9ec709b9bc1b895367e10b976553f28 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-pnx4008/gpio.h
+ * arch/arm/mach-pnx4008/include/mach/gpio.h
  *
  * PNX4008 GPIO driver - header file
  *
similarity index 93%
rename from include/asm-arm/arch-pnx4008/hardware.h
rename to arch/arm/mach-pnx4008/include/mach/hardware.h
index a4410397a921bb655ecb6faf19cb518e941cf9ec..7b98b828d3688cd138b38e6c69bab33f31c0c0b4 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-pnx4008/io.h
rename to arch/arm/mach-pnx4008/include/mach/io.h
index 29ee43955c52ae7cee540f465cc1f56d21330b0b..c6206f25839d16ed65f0990ce266fa2467ea1567 100644 (file)
@@ -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>
  *
similarity index 97%
rename from include/asm-arm/arch-pnx4008/irq.h
rename to arch/arm/mach-pnx4008/include/mach/irq.h
index fabff5dc337f9a8c9238f3ab969f57acab4f3ff9..2a690ca3387021a755b421b912b8b181a5feaaf3 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-pnx4008/irqs.h
rename to arch/arm/mach-pnx4008/include/mach/irqs.h
index a25d18f2d87a7ba2d4d583c0cc048fd352a6d0d5..f6b33cf23ae293a65f6578275a41ea6b485dd999 100644 (file)
@@ -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
  *
similarity index 92%
rename from include/asm-arm/arch-pnx4008/memory.h
rename to arch/arm/mach-pnx4008/include/mach/memory.h
index 0d8268a9526120da8f8715d28b50d183cbcabb4b..5789a2d16f5a03da63b233229549217ef0bcbae0 100644 (file)
@@ -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.
similarity index 94%
rename from include/asm-arm/arch-pnx4008/param.h
rename to arch/arm/mach-pnx4008/include/mach/param.h
index 95d5f547b4164c2e8b22357f49c6c765502d6a08..6ea02f2176b7e7d69918864fed74b0afacc97ab4 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-pnx4008/platform.h
rename to arch/arm/mach-pnx4008/include/mach/platform.h
index 2613c7c669b171338a854de28c555915b334e045..368c2c10a308cc8395272c49552e47aadc0f617c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-pnx4008/platform.h
+ * arch/arm/mach-pnx4008/include/mach/platform.h
  *
  * PNX4008 Base addresses - header file
  *
similarity index 95%
rename from include/asm-arm/arch-pnx4008/pm.h
rename to arch/arm/mach-pnx4008/include/mach/pm.h
index bac1634cb3e0ae192ec9a047dbc65c3eece6728e..2fa685bff858941e1b2e1fe46016052d474a8d46 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-pnx4008/system.h
rename to arch/arm/mach-pnx4008/include/mach/system.h
index 17f9d7f9e5a17f5776fc89af23501a26f70b8a72..8985a4622b8c45d8cc7ba61db56946555469027a 100644 (file)
@@ -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)
 {
similarity index 96%
rename from include/asm-arm/arch-pnx4008/timex.h
rename to arch/arm/mach-pnx4008/include/mach/timex.h
index f22ee24a02191b3b91df614b695933b694b64773..956fbd8e977cb4a849b28e5e2ec17f8804bebb99 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-pnx4008/uncompress.h
rename to arch/arm/mach-pnx4008/include/mach/uncompress.h
index 8fa4d24b72b40b89bb0a0cedff14af27e364902f..bb4751ee2539a7649d124f610769e1884e4266af 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/arch-pnx4008/vmalloc.h
rename to arch/arm/mach-pnx4008/include/mach/vmalloc.h
index 140d925f6f375e046cf13875851441beedd0017a..2ad398378aed3241e47bf9dc14237f9acf63bd95 100644 (file)
@@ -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>
  *
index 7eba2929a1375f2f573bdcbba7a29f0d9f5f702f..5c4f55af5d4bd55bbac3eb49629665c3c89ce2d9 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/pgtable.h>
@@ -32,7 +32,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
-#include <asm/arch/irq.h>
+#include <mach/irq.h>
 
 static u8 pnx4008_irq_type[NR_IRQS] = PNX4008_IRQ_TYPES;
 
index 52c51f91ed8ae0f9e81c86d563fd03fdc1e35eb6..f970906d884881ad64b6f59454d158d1ff39dc24 100644 (file)
@@ -21,8 +21,8 @@
 
 #include <asm/io.h>
 #include <asm/cacheflush.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/clock.h>
+#include <mach/pm.h>
+#include <mach/clock.h>
 
 #define SRAM_VA IO_ADDRESS(PNX4008_IRAM_BASE)
 
index a95bd19e00cb070da4bf18ba88886e3fbe01d1db..9be84bbb30e8d0692b985265d0ec8f174057f79a 100644 (file)
 
 #include <asm/io.h>
 
-#include <asm/arch/platform.h>
-#include <asm/arch/hardware.h>
+#include <mach/platform.h>
+#include <mach/hardware.h>
 
 #include <linux/serial_core.h>
 #include <linux/serial_reg.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #define UART_3         0
 #define UART_4         1
index fe6bdcdda4f39f42685736b86816aac5d8dbe6ed..f4eed495d29540e61812b0d6190b9bd97fcb7c40 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define PWRMAN_VA_BASE IO_ADDRESS(PNX4008_PWRMAN_BASE)
 #define PWR_CTRL_REG_OFFS 0x44
index 616cb3e9605919ba8c991b9db23acea50c900f66..180975244f96ece792c2f21ffc21ecc13da5fe39 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/irq.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>
index 254892ac30cd929e2487b10f914095b478c78163..5c67b188a3ba6d0db23513b263e45fc4ed26a646 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <asm/arch/akita.h>
+#include <mach/akita.h>
 
 /* MAX7310 Regiser Map */
 #define MAX7310_INPUT    0x00
index d858f9864bfa30d57c132617d117a268241da18a..c01eea88f7874e702ffa50af37b9d56e67d4cb63 100644 (file)
@@ -12,9 +12,9 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/hardware.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/hardware.h>
 
 #include "devices.h"
 #include "generic.h"
index 31f5bd411cedd89aa554b9899f2de336064c0a96..2d5bcea1e52077b9601253ad6ea403eae7f6558c 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/gpio.h>
 
 #include <asm/mach/pci.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #include <asm/mach-types.h>
 
 #include <asm/hardware/it8152.h>
index 402e807eae54cef3fea7cd99d5422e87b9c0cc62..af003a2695341707490747be9f719f2b11615e19 100644 (file)
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/bitfield.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/pxa-regs.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/ohci.h>
+#include <mach/mmc.h>
+#include <mach/bitfield.h>
 
 #include <asm/hardware/it8152.h>
 
index c0c81b7a94f6485e78e0983714025332788b4396..abce13c846c5e4c8315a830df7aa05681d598323 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/colibri.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/colibri.h>
 
 #include "generic.h"
 #include "devices.h"
index 8c43e27300262aaaa8000fe526456d02af2f1448..123a950db4661704d6ac7acf5b8fcceecc4a226c 100644 (file)
@@ -26,7 +26,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/sharpsl.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/irda.h>
+#include <mach/mmc.h>
+#include <mach/udc.h>
+#include <mach/corgi.h>
+#include <mach/sharpsl.h>
 
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/scoop.h>
index b08290bd5fa087ffebd1ead898e087e2058410ac..311baf149b07164646d4af91d0226732572c73d7 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <asm/arch/akita.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/sharpsl.h>
-#include <asm/arch/spitz.h>
+#include <mach/akita.h>
+#include <mach/corgi.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/sharpsl.h>
+#include <mach/spitz.h>
 #include <asm/hardware/scoop.h>
 #include <asm/mach/sharpsl_param.h>
 #include "generic.h"
index abd8b13e7316e891d389ccec5b85c0d633c05a8a..35bbfccd2df30fb1c4217a940839f26dad272279 100644 (file)
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/scoop.h>
 
-#include <asm/arch/sharpsl.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/sharpsl.h>
+#include <mach/corgi.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
 #include "sharpsl.h"
 
 #define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */
index 21e616f2bb41160ab50457727230b35ea43d977f..8e2f2215c4bac609529fed84388a7142b9e420ed 100644 (file)
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/ssp.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/regs-ssp.h>
+#include <mach/ssp.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/regs-ssp.h>
 #include "sharpsl.h"
 
 static DEFINE_SPINLOCK(corgi_ssp_lock);
index 8f6075a2996141bd2d7388b886faf09fca666f6e..6f5569bac131e3bb5b3d860ede43f6746a37cf48 100644 (file)
@@ -37,9 +37,9 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 
 #ifdef DEBUG
 static unsigned int freq_debug;
index 84489dc51d810126c08c444f91d4d10fb0823574..35736fc08634bb5033b5cf8d2c5a54fbb019fcde 100644 (file)
@@ -4,19 +4,19 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pxa27x_keypad.h>
-#include <asm/arch/pxa2xx_spi.h>
-#include <asm/arch/camera.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxa3xx_nand.h>
+#include <mach/gpio.h>
+#include <mach/udc.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/i2c.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/ohci.h>
+#include <mach/pxa27x_keypad.h>
+#include <mach/pxa2xx_spi.h>
+#include <mach/camera.h>
+#include <mach/audio.h>
+#include <mach/pxa3xx_nand.h>
 
 #include "devices.h"
 #include "generic.h"
index 2532b6d6671561b0879ee63f7f3bf42657cdabb9..c0be17e0ab82f4285921f63b7d178deeea07fa14 100644 (file)
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 struct dma_channel {
        char *name;
index 16c0236306267764d2181971f4d709d2442d1b04..263884165f57a3f1d92f5864cb3b5e8cb450056b 100644 (file)
@@ -14,8 +14,8 @@
 #include <linux/module.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxafb.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxafb.h>
 
 static struct pxafb_mode_info e400_pxafb_mode_info = {
        .pixclock       = 140703,
index e5cc6ca63c754e687f75f0391fbb60f2fbb8d02e..7a0a681a58475d98c7449e0bcc0149e786b9acec 100644 (file)
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa27x-udc.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/pxa27x_keypad.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa27x-udc.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/ohci.h>
+#include <mach/mmc.h>
+#include <mach/pxa27x_keypad.h>
 
 #include "generic.h"
 
index c29b7b21c11be82862accaa0c3aa7e9620b1d0b2..03942450885b14a94bf0dfa33e7c757a13544280 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include "generic.h"
index 362847a109989ccf7f86256025922e3d8c6eb17b..d622c04c0d44a3f448ea2c6359610be1b381fd87 100644 (file)
 #include <linux/init.h>
 #include <linux/device.h>
 
-#include <asm/arch/udc.h>
-#include <asm/arch/eseries-gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/udc.h>
+#include <mach/eseries-gpio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
index 0143eed653982ee2745ae8407a11cc53b16f7800..cc3d850cc0b6bc961cd42c6a46f09e476efdcaee 100644 (file)
 #include <linux/pwm_backlight.h>
 
 #include <asm/setup.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/i2c.h>
+#include <mach/pxafb.h>
+#include <mach/ohci.h>
+#include <mach/i2c.h>
 
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
index 2106028636f421ab2cca4bb197107bfbd19dec68..2834b7fff78c350c3dc3422d7ccf1ed9d6693aa6 100644 (file)
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 #include "generic.h"
 
index 1f34f23e177343811445f78ce54afe530d63dcc8..07acc1b2385795e71aaae6d007482a499a044388 100644 (file)
 #include <linux/sysdev.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
 
 #include "generic.h"
 
index 2bc06363940111bb55b0193e26fcf9798f84de87..c0092472fa589761d4d6afc281bf9b4c6c4abac7 100644 (file)
@@ -26,7 +26,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/gumstix.h>
+#include <mach/mmc.h>
+#include <mach/udc.h>
+#include <mach/gumstix.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
 
 #include "generic.h"
 
index a994292fba110e07e3df576f87f88a41dc6bae67..5aa0270d5605fc9814a7c86197842e0a0391ccbe 100644 (file)
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/idp.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/bitfield.h>
-#include <asm/arch/mmc.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/idp.h>
+#include <mach/pxafb.h>
+#include <mach/bitfield.h>
+#include <mach/mmc.h>
 
 #include "generic.h"
 #include "devices.h"
similarity index 92%
rename from include/asm-arm/arch-pxa/debug-macro.S
rename to arch/arm/mach-pxa/include/mach/debug-macro.S
index 9012cbc0ad8b1677c1f3596b0fd1ce22bc220df5..55d6a175ab19074a2851e57ceeb958dd5c08eda0 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-pxa/dma.h
rename to arch/arm/mach-pxa/include/mach/dma.h
index dbe110ee2666aaeaa0d81005ef063253ea646e51..955bfe60606754e598856afb3eb792760371b0f7 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-pxa/entry-macro.S
rename to arch/arm/mach-pxa/include/mach/entry-macro.S
index 897d164da223d2e7aeb2de5de57715876d446a6b..de16c12d5232209c33b432d96b880d44541b3ada 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-pxa/gpio.h
rename to arch/arm/mach-pxa/include/mach/gpio.h
index 2c1e3d8ad7a236cdb3a6b03ca1c7a401d6bbf9f0..2c538d8c362d40bc00e0cc7760c00dffa4fa4b87 100644 (file)
@@ -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>
 
similarity index 98%
rename from include/asm-arm/arch-pxa/gumstix.h
rename to arch/arm/mach-pxa/include/mach/gumstix.h
index 6fa85c4f94f86ae401c3997892768eae23df7607..42ee1956750ebc1de1c36ed05eec19421c070da0 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-pxa/hardware.h
rename to arch/arm/mach-pxa/include/mach/hardware.h
index 979a45695d7d43c83681314c0b9021c55f84a410..f8fb1e75997f9450c114298a15d82c7f8fc94d98 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-pxa/idp.h
rename to arch/arm/mach-pxa/include/mach/idp.h
index 21aa8ac35c1c30df8fe635b9c851ea447afe09ae..5eff96fcc944d764bdf9fc00423cbb1d62b1af79 100644 (file)
@@ -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
similarity index 83%
rename from include/asm-arm/arch-pxa/io.h
rename to arch/arm/mach-pxa/include/mach/io.h
index af34e0f2f7dc02453168f5d0a86ba5856544ee16..600fd4f76603a51c6145839d74f0e5832ed790e8 100644 (file)
@@ -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
 
similarity index 99%
rename from include/asm-arm/arch-pxa/irqs.h
rename to arch/arm/mach-pxa/include/mach/irqs.h
index 9413121b0ed9cad890650235b1018e7cf291b1cc..32772bc6925c93e699471c4f0903647d2f8806e4 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-pxa/lpd270.h
rename to arch/arm/mach-pxa/include/mach/lpd270.h
index 501d240ac120c48a0f4d11af1502e6e92fec1b10..f89fb715266be05c771b6dc1846bb78635a39b83 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-pxa/lubbock.h
rename to arch/arm/mach-pxa/include/mach/lubbock.h
index 11ee73593fc3a248bc1b3eb535ee39867801f0db..4cb24154a5a8add2beca23d8285762588ca854f6 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-pxa/magician.h
rename to arch/arm/mach-pxa/include/mach/magician.h
index 169b374f9921968031b0b7dccb22673e3366256a..38d68d99f58552fc03847e6ae5fd4b094c48840a 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _MAGICIAN_H_
 #define _MAGICIAN_H_
 
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 /*
  * PXA GPIOs
similarity index 99%
rename from include/asm-arm/arch-pxa/mainstone.h
rename to arch/arm/mach-pxa/include/mach/mainstone.h
index 14c862adcaa1b8aaf5fe002c0eced15224fd9afc..3461c4302ff40ac49390f69e4135fb1298fb7a31 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-pxa/memory.h
rename to arch/arm/mach-pxa/include/mach/memory.h
index bee81d66c184b5a3bf4b4534e7119a0d27abb425..552eb7fa657925bb5b528226137dd6f0721e1637 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa25x.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
index 0499323010baf7a0d74782874bf73b0adf7c31d0..6c8e72238bfd360cb2680d35cfd429301be3b0c2 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa27x.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
index bc73ab84167cb14b0bfc5c71e22f81e50ea774f0..122bdbd5318222bddbc2b5469784d41e69704b64 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa2xx.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h
index 8de1c0dae624a29ff25b904a063dcf9633f290d2..3e9211591e20e8c607fce324c35f817af4651391 100644 (file)
@@ -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:
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa300.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa300.h
index bb410313556fe560f2152071773cb1403dc0cf1a..bc1fb33a6e70e4329c309ef3ca2634a1c6e49849 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa320.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa320.h
index 576aa46d90fcc6fe1777d3642facb8274e751d99..74990510cf34846c47d2f7db46e97d4cf3e6bf02 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp-pxa930.h
rename to arch/arm/mach-pxa/include/mach/mfp-pxa930.h
index c4e945ab19232c280c384f0066193e638a0e864b..fabd9b4df827075f2d30a16f170971bb9706f3b9 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-pxa/mfp.h
rename to arch/arm/mach-pxa/include/mach/mfp.h
index e7d58798da6769e1b4922419d565617c1313f22b..8769567b389b15d5178ddbc4dc997f68d83e88de 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-pxa/mfp.h
+ * arch/arm/mach-pxa/include/mach/mfp.h
  *
  * Multi-Function Pin Definitions
  *
similarity index 97%
rename from include/asm-arm/arch-pxa/mtd-xip.h
rename to arch/arm/mach-pxa/include/mach/mtd-xip.h
index 8704dbceb43206d40a7c0e596cb701adc0c5218d..351f32f13ce42f7f1586cf46919848c760307e27 100644 (file)
@@ -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)
 
similarity index 98%
rename from include/asm-arm/arch-pxa/pcm027.h
rename to arch/arm/mach-pxa/include/mach/pcm027.h
index 7beae1472c3e82227e525fe6973d37be4536964b..4dcd2e8baa6127ab0637f41c0dcdd6b9c43f7387 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-pxa/pcm990_baseboard.h
rename to arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
index 2e20131790632da57dbe43a1124c82347230a15b..8a4383b776d7fb7806f17ed6cfb163b681aea18f 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-pxa/poodle.h
rename to arch/arm/mach-pxa/include/mach/poodle.h
index 4d6a4031576400145bc41a4d09defe3dedc87dfd..8956afe8195ec46a76d9acfd24fda3affe40f686 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-pxa/pxa-regs.h
rename to arch/arm/mach-pxa/include/mach/pxa-regs.h
index dce9308626b794076b78da830e159d70b5c2c7e7..12288ca3cbb2022ee3dc2a45ee375a6be8096374 100644 (file)
@@ -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
  */
 
 /*
- * 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
  */
 
 /*
  */
 
 /*
- * 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
similarity index 99%
rename from include/asm-arm/arch-pxa/pxa2xx-regs.h
rename to arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
index 73e0a329cf7fffd6e7e2e870581dd33262616e10..806ecfea44bfb87c18f09ac8c5c49ccdc29838ab 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-pxa/pxa3xx-regs.h
rename to arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index fe9364c83a28b3f384ba0085bf1ea6170bb167e6..39eb68319e28dfb8815ddbabdbbbc3e9b3271c83 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-pxa/pxafb.h
rename to arch/arm/mach-pxa/include/mach/pxafb.h
index daf018d0c60409cbaa4ad53bf6b181fd1e5bbcc7..65447549616fc5ca3b3998967acbbf44ed917372 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-pxa/regs-lcd.h
rename to arch/arm/mach-pxa/include/mach/regs-lcd.h
index 820a189684a9308109ecb712fade173302c5a345..c689c4ea769cbf3892bac3d44134b4324052af8f 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-pxa/system.h
rename to arch/arm/mach-pxa/include/mach/system.h
index 6956fc5235f837eed8b0d7661968bc69a8acc268..0f381e69299972604e3b95817310a5f2a286e894 100644 (file)
@@ -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
similarity index 93%
rename from include/asm-arm/arch-pxa/timex.h
rename to arch/arm/mach-pxa/include/mach/timex.h
index 8d882f0b6a163f9c580563c098cc29f1eac767a7..b05fc6683c4739a3d9a6454c96f573b20347476b 100644 (file)
@@ -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
similarity index 73%
rename from include/asm-arm/arch-pxa/udc.h
rename to arch/arm/mach-pxa/include/mach/udc.h
index 27aa3a91012f88ac966edfa7a38a1c1e895fcc03..2f82332e81a00f03aed9a9db2290bf6f422efe34 100644 (file)
@@ -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>
similarity index 91%
rename from include/asm-arm/arch-pxa/uncompress.h
rename to arch/arm/mach-pxa/include/mach/uncompress.h
index f4551269aaf2e667ed7829857df75c65ed82e6a4..21e3e890af984869ce3ab2346bfbb95c0beda562 100644 (file)
@@ -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)
similarity index 87%
rename from include/asm-arm/arch-pxa/vmalloc.h
rename to arch/arm/mach-pxa/include/mach/vmalloc.h
index 5bb450c7aa2cefdc9bb1eba5b3d0e4a529d18a86..e90c5eeb81dde9b94304e2eae66ab7b10ea0337e 100644 (file)
@@ -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.
index 26a9d8b7d5f101b5f6c1d6cfe11dc299afbe7499..5e95c5372fecde471b8767f2cc94d7a815377a7e 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 #include "generic.h"
 
index c410e53bf9e9fa162babeb1f518c8a08914c1079..18b20d4694100ccf39c304aec84b35ba4ee49b32 100644 (file)
 
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/idp.h>
+#include <mach/pxa-regs.h>
+#include <mach/idp.h>
 
 #include "leds.h"
 
index 7eafbb4d507970e0ad6368109f4834965da527f6..1a258029c33c4290ba1a55a0ac0862ab1ea37603 100644 (file)
 
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/lubbock.h>
+#include <mach/pxa-regs.h>
+#include <mach/lubbock.h>
 
 #include "leds.h"
 
index 32ca5acfa1c19bf2c613fbbdc4b9804c82673ad6..95e06b8496346a26df86e11462063c9c44c4637e 100644 (file)
 
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mainstone.h>
+#include <mach/pxa-regs.h>
+#include <mach/mainstone.h>
 
 #include "leds.h"
 
index c2fe1db22bf1f2d1fa51640cabb5d7229c4cf5cd..3bc29007df3a5f209aec0bd83fd6978ba0ab2f6c 100644 (file)
 
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/types.h>
 #include <asm/leds.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/trizeps4.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/trizeps4.h>
 
 #include "leds.h"
 
index 101bd7ee81519b87651c5bfb7e958812a3017a00..58f3402a0375561b2395532169a98058f1630a10 100644 (file)
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mfp-pxa300.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/ssp.h>
-#include <asm/arch/pxa27x_keypad.h>
-#include <asm/arch/pxa3xx_nand.h>
-#include <asm/arch/littleton.h>
+#include <mach/pxa-regs.h>
+#include <mach/mfp-pxa300.h>
+#include <mach/gpio.h>
+#include <mach/pxafb.h>
+#include <mach/ssp.h>
+#include <mach/pxa27x_keypad.h>
+#include <mach/pxa3xx_nand.h>
+#include <mach/littleton.h>
 
 #include "generic.h"
 
index 34c69b10f1b51f2e720f69f24ecbb0b37aa1038f..b7038948d1d442db1e732f987a9875bb554405f9 100644 (file)
@@ -29,7 +29,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/lpd270.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/ohci.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/lpd270.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/ohci.h>
 
 #include "generic.h"
 #include "devices.h"
index 66a3f334d6df2e6191eac0296fe6b3a28da1b651..4ba8d31907213cdf16361fdf42b7a8fc178d3d7b 100644 (file)
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
-#include <asm/arch/pxa2xx_spi.h>
+#include <mach/pxa2xx_spi.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
 
 #include <asm/hardware/sa1111.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa25x.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/lubbock.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mmc.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/audio.h>
+#include <mach/lubbock.h>
+#include <mach/udc.h>
+#include <mach/irda.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
 
 #include "generic.h"
 #include "devices.h"
index e919f37be72bcf19c6747f92d23a4705bdf25028..143f28adaf95bddf4c39639be747d797dd85af50 100644 (file)
 #include <linux/pda_power.h>
 #include <linux/pwm_backlight.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/magician.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/ohci.h>
+#include <mach/magician.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxafb.h>
+#include <mach/i2c.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/ohci.h>
 
 #include "devices.h"
 #include "generic.h"
index 425ba9666daa66f04d1f9acd0464d86ff42e1f2c..d44af761564dde1db79fed919554adb47c8be3f1 100644 (file)
@@ -32,7 +32,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/mainstone.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pxa27x_keypad.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/mainstone.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/i2c.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/ohci.h>
+#include <mach/pxa27x_keypad.h>
 
 #include "generic.h"
 #include "devices.h"
index fd4545eab8033172144a27f54edff48c4931872f..925575f10acfe9b00c5d6cf85d4558dc4de7d042 100644 (file)
 #include <linux/init.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa2xx.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa2xx.h>
 
 #include "generic.h"
 
index c15183174d7e5368483ec62a9e4393c1b2b20ad0..eb197a6e8e94aec097c8d7110a9441487ac633b1 100644 (file)
 #include <linux/io.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/mfp.h>
-#include <asm/arch/mfp-pxa3xx.h>
-#include <asm/arch/pxa3xx-regs.h>
+#include <mach/hardware.h>
+#include <mach/mfp.h>
+#include <mach/mfp-pxa3xx.h>
+#include <mach/pxa3xx-regs.h>
 
 /* mfp_spin_lock is used to ensure that MFP register configuration
  * (most likely a read-modify-write operation) is atomic, and that
index 408657a24f8cfd8ef0002eccd17656d34d8220c9..fe924a23debe316f632e0af740600db2f8a312b4 100644 (file)
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/audio.h>
-#include <asm/arch/palmtx.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/pxa27x_keypad.h>
-#include <asm/arch/udc.h>
+#include <mach/audio.h>
+#include <mach/palmtx.h>
+#include <mach/mmc.h>
+#include <mach/pxafb.h>
+#include <mach/pxa-regs.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/irda.h>
+#include <mach/pxa27x_keypad.h>
+#include <mach/udc.h>
 
 #include "generic.h"
 #include "devices.h"
index 377f3be8ce578fc5f04477cb12c9ef94532c7d41..730b9f6ede1dcbc179b543602e1b4d6e197b8842 100644 (file)
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx_spi.h>
-#include <asm/arch/pcm027.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx_spi.h>
+#include <mach/pcm027.h>
 #include "generic.h"
 
 /*
index 90056d56b2104dfc0b7f76f1776948a564e1b179..420c9b3813f6d42bc956f37e7fcf695605b81c82 100644 (file)
 #include <media/soc_camera.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/camera.h>
+#include <mach/i2c.h>
+#include <mach/camera.h>
 #include <asm/mach/map.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pcm990_baseboard.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mfp-pxa27x.h>
+#include <mach/pxa-regs.h>
+#include <mach/audio.h>
+#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/pcm990_baseboard.h>
+#include <mach/pxafb.h>
+#include <mach/mfp-pxa27x.h>
 
 #include "devices.h"
 #include "generic.h"
index 9445bf11e7aec8058aca71baff07f4d900d7ced9..1b539e675579cc3388f72699e1c2aba12a148691 100644 (file)
 #include <linux/errno.h>
 #include <linux/time.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/memory.h>
 #include <asm/system.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/lubbock.h>
+#include <mach/pm.h>
+#include <mach/pxa-regs.h>
+#include <mach/lubbock.h>
 #include <asm/mach/time.h>
 
 struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;
index fef958fddf5ce369f9caf3eb70a4f148ad4ac558..055ec63d768cf4789b7ee9a43631d650441f6525 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/pm.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/poodle.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/sharpsl.h>
-#include <asm/arch/ssp.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/mmc.h>
+#include <mach/udc.h>
+#include <mach/irda.h>
+#include <mach/poodle.h>
+#include <mach/pxafb.h>
+#include <mach/sharpsl.h>
+#include <mach/ssp.h>
 
 #include <asm/hardware/scoop.h>
 #include <asm/hardware/locomo.h>
index ce28cd9fed163d4933252693e92d81c1a21c110b..316cd986da5cea37dbe6692b57124dc0e9fb46b0 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/pwm.h>
 
 #include <asm/div64.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 /* PWM registers and bits definitions */
 #define PWMCR          (0x00)
index c8379e5309d78a3fa83e84def3faebdcc74b64b3..3c2d22de9a13db08bb34ba021cb1b9932e81004f 100644 (file)
 #include <linux/suspend.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa25x.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/dma.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/pm.h>
+#include <mach/dma.h>
 
 #include "generic.h"
 #include "devices.h"
index 46720ed2a677dce0cba51089d63c7087a1027057..6bec43484ba7dc5e05b555672a3afa9b63338908 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa27x.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/i2c.h>
+#include <mach/irqs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/ohci.h>
+#include <mach/pm.h>
+#include <mach/dma.h>
+#include <mach/i2c.h>
 
 #include "generic.h"
 #include "devices.h"
index d4f6415e8413caaa007f143fd79ea0792f2d43b9..00b4de6d6bdd421a754330eef2c2cbadc1a553f8 100644 (file)
@@ -14,9 +14,9 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 
-#include <asm/arch/mfp-pxa2xx.h>
-#include <asm/arch/mfp-pxa25x.h>
-#include <asm/arch/irda.h>
+#include <mach/mfp-pxa2xx.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/irda.h>
 
 static unsigned long pxa2xx_mfp_fir[] = {
        GPIO46_FICP_RXD,
index b8482da3e4d5ac86a0010766d97f527fb1968f43..494fc1f032dbc1da8e35842a04ae038caef4181e 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa3xx-regs.h>
-#include <asm/arch/mfp-pxa300.h>
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa300.h>
 
 #include "generic.h"
 #include "devices.h"
index 95d46d92621f3489415db27d2241ddaab6f6e98f..016eb18f01a3859dc89c1eeebe68900f568e46d5 100644 (file)
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/mfp.h>
-#include <asm/arch/pxa3xx-regs.h>
-#include <asm/arch/mfp-pxa320.h>
+#include <mach/hardware.h>
+#include <mach/mfp.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa320.h>
 
 #include "generic.h"
 #include "devices.h"
index 4f5e6c7f6951a29f83e571cd4a48588ed658ea4b..37b07212b5a519760785bb82cfc5057dcab1cf0f 100644 (file)
 #include <linux/io.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa3xx-regs.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/ssp.h>
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/ohci.h>
+#include <mach/pm.h>
+#include <mach/dma.h>
+#include <mach/ssp.h>
 
 #include "generic.h"
 #include "devices.h"
index 028ee1d86548bb9e98440f7b5d1bf5089a1f521e..13e6bfdfff608dede563238676b39fc2b7d01a34 100644 (file)
@@ -16,8 +16,8 @@
 #include <linux/irq.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/mfp-pxa930.h>
+#include <mach/hardware.h>
+#include <mach/mfp-pxa930.h>
 
 static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
 
index 9d39dea57ce27a2fc6effecf505cfb38e73dab0f..fabead71d681a88272343bbd01b296648f0e1379 100644 (file)
@@ -10,8 +10,8 @@
 #include <asm/io.h>
 #include <asm/proc-fns.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 
 static void do_hw_reset(void);
 
index ee70dee5b4dc71772a7b44f59de296e6ec432f3b..e7ea91ce7f02c8da83d78db74368068e6a04c578 100644 (file)
@@ -21,9 +21,9 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa3xx-regs.h>
-#include <asm/arch/mfp-pxa930.h>
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa930.h>
 
 #include "devices.h"
 #include "generic.h"
index 7b7d0bd32eb1d63ad8a746f4fda5d29bf45cedd9..e804ae09370c0bc756aa69e55a3ea81d1dead4d3 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/apm-emulation.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/sharpsl.h>
+#include <mach/pm.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/sharpsl.h>
 #include "sharpsl.h"
 
 struct battery_thresh spitz_battery_levels_acin[] = {
index 2a58f1e40e337ecdced773d64630db14b2a46f6d..a62c8375eb5349e2a1b1acce5f0177b613eb4282 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 
 #define MDREFR_KDIV    0x200a4000      // all banks
 #define CCCR_SLEEP     0x00000107      // L=7 2N=2 A=0 PPDIS=0 CPDIS=0
index a8774d458498e8c6d2ada88fc92d6fdf0c3f94be..26b9fa56cffd9ed6b81a1fc8c453855f5892dca0 100644 (file)
@@ -26,7 +26,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/pxa27x-udc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/akita.h>
-#include <asm/arch/spitz.h>
-#include <asm/arch/sharpsl.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/pxa27x-udc.h>
+#include <mach/irda.h>
+#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/udc.h>
+#include <mach/pxafb.h>
+#include <mach/akita.h>
+#include <mach/spitz.h>
+#include <mach/sharpsl.h>
 
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/scoop.h>
index 8fb5651548deb57e24d8aadc6d9c2d62f33929f0..8a40505dfd28b8081da8199ff02c31a8d87186d4 100644 (file)
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/scoop.h>
 
-#include <asm/arch/sharpsl.h>
-#include <asm/arch/spitz.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/sharpsl.h>
+#include <mach/spitz.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
 #include "sharpsl.h"
 
 #define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */
index bca34e5c8c0454aab940b0d87c0951c26a9f9ee3..9bd93c5f28b2eb81d9947510c85f463a29c378b7 100644 (file)
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/ssp.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/regs-ssp.h>
+#include <mach/hardware.h>
+#include <mach/ssp.h>
+#include <mach/pxa-regs.h>
+#include <mach/regs-ssp.h>
 
 #define TIMEOUT 100000
 
index 207fb6076624f609dd565ad208cdb77046c3154d..f3821cfda72f9a1118c1178ff5be866f36a0787b 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 
                .text
 
index 9dcb349e6d908261649985c77444366c3050f06b..589d32b4fc46e55c46e822353d216318361da78e 100644 (file)
@@ -21,9 +21,9 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa3xx-regs.h>
-#include <asm/arch/mfp-pxa930.h>
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa930.h>
 
 #include "devices.h"
 #include "generic.h"
index 7b7c0179795bad36e66abcf63fce82abac4619db..67e18509d7bfe6103b4d5062a307c0fe12c029e8 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/cnt32_to_63.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #include <asm/mach-types.h>
 
 /*
index 7d8505466e54c55be58a5d8d71f2cda3fe5e6d46..fb0294bd43107442d4a0f3f569f67caf4ba59c29 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/rfkill.h>
 
-#include <asm/arch/tosa_bt.h>
+#include <mach/tosa_bt.h>
 
 static void tosa_bt_on(struct tosa_bt_data *data)
 {
index fea17ce6b55f5a812fa5f89e57cf851fc78850c5..38bc59c441101324e94b668ee96ec57cf907366b 100644 (file)
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/mfp-pxa25x.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/tosa_bt.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/irda.h>
+#include <mach/i2c.h>
+#include <mach/mmc.h>
+#include <mach/udc.h>
+#include <mach/tosa_bt.h>
 
 #include <asm/mach/arch.h>
-#include <asm/arch/tosa.h>
+#include <mach/tosa.h>
 
 #include <asm/hardware/scoop.h>
 #include <asm/mach/sharpsl_param.h>
index 6367ac21af84580201244a5d61b7ca452341e80e..3ed757e6bcc896b60be4d52f2f67a073bba80061 100644 (file)
@@ -31,7 +31,7 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
 
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/trizeps4.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/ohci.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/trizeps4.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/ohci.h>
 
 #include "generic.h"
 #include "devices.h"
index f11ced1562b8d126bd33020668ed85f2302961a8..0cb65b5772fe8eb0045a8b2b0686477df6e9b511 100644 (file)
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/zylonite.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/pxa27x_keypad.h>
-#include <asm/arch/pxa3xx_nand.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
+#include <mach/gpio.h>
+#include <mach/pxafb.h>
+#include <mach/zylonite.h>
+#include <mach/mmc.h>
+#include <mach/pxa27x_keypad.h>
+#include <mach/pxa3xx_nand.h>
 
 #include "devices.h"
 #include "generic.h"
index b28d46e081d34e0d1a326e18ed4e74c74aed1882..095f5c648236666467b983b894ae3a1d8771a562 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/i2c/pca953x.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/mfp-pxa300.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/zylonite.h>
+#include <mach/mfp-pxa300.h>
+#include <mach/i2c.h>
+#include <mach/zylonite.h>
 
 #include "generic.h"
 
index 2b7fba7a29211b0fcfa77af0db8ea26b1484ea4d..9879d7da2df52cbf47ccfbed67bf54702fbdaa77 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mfp-pxa320.h>
-#include <asm/arch/zylonite.h>
+#include <mach/gpio.h>
+#include <mach/mfp-pxa320.h>
+#include <mach/zylonite.h>
 
 #include "generic.h"
 
index b63fa88fb42b84b5711e895a15c1be37d1edb5af..4f9c84ab781c35ecf74fe5022ea5e1555fae4a80 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/clockchips.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
similarity index 99%
rename from include/asm-arm/arch-realview/board-eb.h
rename to arch/arm/mach-realview/include/mach/board-eb.h
index 206f7a752882253ed693d4c31918f370dcedd827..8d699fd324d0a559b5bfb1a1638c3603d4154cb3 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-realview/board-pb1176.h
rename to arch/arm/mach-realview/include/mach/board-pb1176.h
index 48ce9c833705eb5345e9d636d8cb84c2d8670226..858eea7b1adce12139d6d5d0bb58c75c40159c58 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-realview/board-pb11mp.h
rename to arch/arm/mach-realview/include/mach/board-pb11mp.h
index a1294d915fa8217c27221515fc3bd2af4001c461..ecd80e58631e5cf7f9ad5202c74a39a684d584c0 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-realview/debug-macro.S
rename to arch/arm/mach-realview/include/mach/debug-macro.S
index c8c860c3c26efd197937de1d8e421e224c0f9150..7196bcadff0ce21ef55ce3ee2a7f018eaaad498e 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-realview/dma.h
rename to arch/arm/mach-realview/include/mach/dma.h
index 8342e3f9d6eca3681011074e8e6fc6e0b0cb1076..f1a5a1a10952e1266bf08fe73cf5e889ade5635b 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-realview/entry-macro.S
rename to arch/arm/mach-realview/include/mach/entry-macro.S
index 31a39a7cdaa9228d7e24e0a611b700bc9aab874c..340a5c276946b596aef73a9a5b52ad02d7384d6e 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-realview/hardware.h
rename to arch/arm/mach-realview/include/mach/hardware.h
index 1ee8313ceb6a98d485558178fe78c0a3c31f7ce3..79a93b3dfca935cbc1f4c0c8a960ce95e6c12a9a 100644 (file)
@@ -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.
  *
similarity index 95%
rename from include/asm-arm/arch-realview/io.h
rename to arch/arm/mach-realview/include/mach/io.h
index c70f1dfbe1354e74552a3e41c09debbf5af5b3ab..aa069424d3101d36d5c4bce47947fc47e409d90e 100644 (file)
@@ -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
  *
similarity index 87%
rename from include/asm-arm/arch-realview/irqs.h
rename to arch/arm/mach-realview/include/mach/irqs.h
index ccbac59235c6634a260df0bf3e7695697e0c815b..02a918529db39251ea6d0f464f39d8f93218b0b4 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-realview/memory.h
rename to arch/arm/mach-realview/include/mach/memory.h
index ed370abb638fd7ce2dfb0df26f653fda5ba6283f..0e673483a141d8087ca73cb12e10337de280e996 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-realview/platform.h
rename to arch/arm/mach-realview/include/mach/platform.h
index 424c0aaf46a0c6c1cc481e5897ace62316d7754b..4034b54950c26d9d811856aceb9d77f5802c113e 100644 (file)
@@ -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.
  *
similarity index 92%
rename from include/asm-arm/arch-realview/system.h
rename to arch/arm/mach-realview/include/mach/system.h
index bff3d3fcf846baef80f71382529c24441b315ae1..4d3c8f3f80537d99888f77660e9c7b32d7408743 100644 (file)
@@ -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)
 {
similarity index 94%
rename from include/asm-arm/arch-realview/timex.h
rename to arch/arm/mach-realview/include/mach/timex.h
index 5b9d82d0a5e05bed03cf405ba7188706be4a295e..4eeb069373c219264a2f894c1464eb778cb0109d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-realview/timex.h
+ *  arch/arm/mach-realview/include/mach/timex.h
  *
  *  RealView architecture timex specifications
  *
similarity index 90%
rename from include/asm-arm/arch-realview/uncompress.h
rename to arch/arm/mach-realview/include/mach/uncompress.h
index 3f7ae2e0260d300766117b5a311cc003913c81d9..79f50f218e77f3a59ee18e14f2e0dab6c0bf2218 100644 (file)
@@ -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
  *
  * 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))
similarity index 94%
rename from include/asm-arm/arch-realview/vmalloc.h
rename to arch/arm/mach-realview/include/mach/vmalloc.h
index 0ad49af186afd441c9a1dacb2e7f4f3743bd84ef..48cbcc873db255d9477c4ce6fb98b25ca0d0d3b0 100644 (file)
@@ -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.
index 7631f3ea851bf636e93952b63a577d398f26b668..82fa1f26e026299d4c75c3365aeff9441c9955c9 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <asm/hardware/arm_twd.h>
 #include <asm/hardware/gic.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index c1e579cbaa76344d246d88770d3bdd2869b1e464..1907d22f4fed55f069320c43b8624f72bb54d149 100644 (file)
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/board-eb.h>
-#include <asm/arch/board-pb11mp.h>
-#include <asm/arch/scu.h>
+#include <mach/board-eb.h>
+#include <mach/board-pb11mp.h>
+#include <mach/scu.h>
 
 extern void realview_secondary_startup(void);
 
index 66c1f3e47f69fa46e506d189411c06a6edd11142..19a9968fc5b9bc5671035e71557e7aa324370ccf 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
@@ -38,8 +38,8 @@
 #include <asm/mach/mmc.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/board-eb.h>
-#include <asm/arch/irqs.h>
+#include <mach/board-eb.h>
+#include <mach/irqs.h>
 
 #include "core.h"
 #include "clock.h"
index a00588a8d8f83f65aa1fd259d65b76f8850b1d21..0986cbd1594358cdfe5679c0bec93481d17c6d53 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
@@ -39,8 +39,8 @@
 #include <asm/mach/mmc.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/board-pb1176.h>
-#include <asm/arch/irqs.h>
+#include <mach/board-pb1176.h>
+#include <mach/irqs.h>
 
 #include "core.h"
 #include "clock.h"
index 018898708b7a149a1c9a017c5d74c492ee596663..f4e7135e3eb581d80a9f393074e16e39157e4761 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
@@ -39,8 +39,8 @@
 #include <asm/mach/mmc.h>
 #include <asm/mach/time.h>
 
-#include <asm/arch/board-pb11mp.h>
-#include <asm/arch/irqs.h>
+#include <mach/board-pb11mp.h>
+#include <mach/irqs.h>
 
 #include "core.h"
 #include "clock.h"
index fb1d42b53785c37b807c67ed1d5fcf11854f9542..4b19fe48419086c35584616b3af78459180d9500 100644 (file)
@@ -20,7 +20,7 @@
 #include <asm/fiq.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 
 #include <asm/mach/dma.h>
similarity index 98%
rename from include/asm-arm/arch-rpc/acornfb.h
rename to arch/arm/mach-rpc/include/mach/acornfb.h
index ecb7733a09499a0179c3c35f867857c287a47d02..395d76288ffe93e3cb12c8a2de7c0c4bb5f5740d 100644 (file)
@@ -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
  *
similarity index 92%
rename from include/asm-arm/arch-rpc/debug-macro.S
rename to arch/arm/mach-rpc/include/mach/debug-macro.S
index c634c8d8f4a152b5d69f02095a35c3ecaf3b4eb3..b2a939ffdcdeed21a9f63e5199eade9e15d7f351 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-rpc/dma.h
rename to arch/arm/mach-rpc/include/mach/dma.h
index d24a27e30b93b763f8f9805d99d56f399d50558d..360b56f8f29f10b87cd7183ba7ce7199acca0ca1 100644 (file)
@@ -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
  *
similarity index 91%
rename from include/asm-arm/arch-cl7500/entry-macro.S
rename to arch/arm/mach-rpc/include/mach/entry-macro.S
index 5bd55557cccacde815b4ee590551cb84c1693402..4e7e541440934a81bcd68ee0822370c96be105db 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-rpc/hardware.h
rename to arch/arm/mach-rpc/include/mach/hardware.h
index 7480f4e8d9747e480e78bccd708d3ea7388800cb..dde6b3c0e299c55574ef50f910da7ed1e0c293a6 100644 (file)
@@ -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))
similarity index 98%
rename from include/asm-arm/arch-rpc/io.h
rename to arch/arm/mach-rpc/include/mach/io.h
index 0d10d4591a45e825d473e472e5d500a70b7b0a67..9f0553b7ec28d4417ddbce9e4a6393eb502b88d3 100644 (file)
@@ -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
 
similarity index 95%
rename from include/asm-arm/arch-rpc/irqs.h
rename to arch/arm/mach-rpc/include/mach/irqs.h
index 27c35b05b27db1445b7a55566ab738d83c7db3fd..4ce6ca97f66966dd530661bc697cb21c84895db5 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-rpc/memory.h
rename to arch/arm/mach-rpc/include/mach/memory.h
index 303c424ce673e502d740c824afabb635ff2bb56d..05425d558ee794518be2bc4508fd48fd20c59d84 100644 (file)
@@ -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.
  *
similarity index 86%
rename from include/asm-arm/arch-rpc/system.h
rename to arch/arm/mach-rpc/include/mach/system.h
index ca3277d1d5ea43ce64befa127c72b40f3d8b4342..54d6e3f2d3193133616eb3b547a6647ecafb5a82 100644 (file)
@@ -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>
 
similarity index 89%
rename from include/asm-arm/arch-rpc/timex.h
rename to arch/arm/mach-rpc/include/mach/timex.h
index ed7df64d960b80522b124546b2aae85126f9c2df..dd75e7387bbe02409e129690212ab3891ca87ee8 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-rpc/uncompress.h
rename to arch/arm/mach-rpc/include/mach/uncompress.h
index 844e4d469fb25e7d01915437a85be7836b8efbb9..baa9c866d7bf6cb137e7b249b84dcdabb88fa872 100644 (file)
@@ -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>
similarity index 86%
rename from include/asm-arm/arch-rpc/vmalloc.h
rename to arch/arm/mach-rpc/include/mach/vmalloc.h
index 077046bb2f368f309fea38fa10da8f5e0e90ddc1..9a96fd69e7051e88f9d031bb91155cc56e4a8844 100644 (file)
@@ -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
  *
index 54a6c756584cfdfaf843a335d3334844de0e31f4..ce8470fea8873c4dd14fc262479779ff08b01a31 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/elf.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include <asm/domain.h>
 #include <asm/setup.h>
index 140fd2548b466d6121b51657e8bcf738b5dd6c25..148d0ddef3e87843134200e39d74fc6208f23619 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 int s3c2400_gpio_getirq(unsigned int pin)
 {
similarity index 98%
rename from include/asm-arm/arch-s3c2400/map.h
rename to arch/arm/mach-s3c2400/include/mach/map.h
index 1184d907b31e540b806216bdc89c4270d93dddea..1535540edc821c1f4edd2ac3e5176971f10849c3 100644 (file)
@@ -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/
similarity index 84%
rename from include/asm-arm/arch-s3c2400/memory.h
rename to arch/arm/mach-s3c2400/include/mach/memory.h
index fb0381dde7047d5163b089c79665e8df174d5be2..8f4878e4f591930af6d1a2d88bca838aeff14e2e 100644 (file)
@@ -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/
index df95fe37cdc84d71102245a59db84e464b0aea8b..298ececfa366288d80a2ee445348f88f493fd8e8 100644 (file)
@@ -24,9 +24,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/map.h>
-#include <asm/arch/bast-map.h>
-#include <asm/arch/bast-irq.h>
+#include <mach/map.h>
+#include <mach/bast-map.h>
+#include <mach/bast-irq.h>
 
 /* IDE ports */
 
index 4e58bc0e30e3de539f867623c4abdeefbd59ea3f..c66021b5fa4d055a76ce2a7c5afb7960d0964a98 100644 (file)
 
 #include <asm/mach-types.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/bast-map.h>
-#include <asm/arch/bast-irq.h>
+#include <mach/regs-irq.h>
+#include <mach/bast-map.h>
+#include <mach/bast-irq.h>
 
 #include <asm/plat-s3c24xx/irq.h>
 
index 4e6239726aaec820877ecdf8ee38e3da603e9a3c..1322851d1acb031bd441e2f4a433de6d68dad8db 100644 (file)
 
 #include <asm/mach/map.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/clock.h>
index 8f12e855ef5f2ac093ed3d8a6658fcf72349d2dc..8730797749e3a8ee65ea7daed665d32a828a14e3 100644 (file)
 #include <linux/serial_core.h>
 
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/dma.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-sdi.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
 
index d15621ef5b672192cb6ba6c69f040873f5365c2a..c6eefb1d590c3028022bcecbf378cb0b3244f35f 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
                           unsigned int config)
index affa4fa12ac105c9ef57e94a23edcbb3db21f8aa..5a6bc56f186b2c1a9aa3259c7a81f2960aa8bc66 100644 (file)
@@ -16,9 +16,9 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/leds.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/h1940-latch.h>
+#include <mach/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/h1940-latch.h>
 
 #define DRV_NAME              "h1940-bt"
 
similarity index 92%
rename from include/asm-arm/arch-s3c2410/anubis-cpld.h
rename to arch/arm/mach-s3c2410/include/mach/anubis-cpld.h
index 168b93fee529a322641238f0a012d158b580868c..1b614d5a81f337635c23ec1d5ebab6622a4b1099 100644 (file)
@@ -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/
similarity index 91%
rename from include/asm-arm/arch-s3c2410/anubis-irq.h
rename to arch/arm/mach-s3c2410/include/mach/anubis-irq.h
index cd77a70d45c0849648f7cf69a99f60432aa26f08..a2a328134e343f284648bedd60c9e61468d2c1ce 100644 (file)
@@ -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/
similarity index 95%
rename from include/asm-arm/arch-s3c2410/anubis-map.h
rename to arch/arm/mach-s3c2410/include/mach/anubis-map.h
index 830d114261da8745eec077b7cc2235673d21cf3a..c9deb3a5b2c3cc4c732cd6eec074703accb8fc86 100644 (file)
@@ -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/
similarity index 96%
rename from include/asm-arm/arch-s3c2410/audio.h
rename to arch/arm/mach-s3c2410/include/mach/audio.h
index 0a6977fb57701a6f0667ad9a6a802678b6de5c0f..de0e8da48bc33e77f5ec49e2776255fb80c7ff0a 100644 (file)
@@ -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/
similarity index 96%
rename from include/asm-arm/arch-s3c2410/bast-cpld.h
rename to arch/arm/mach-s3c2410/include/mach/bast-cpld.h
index 034d2c5a47c4b2aaf0df5dac66607221b64b0bd0..20493b048360aa665f10aadff373dd409429cabb 100644 (file)
@@ -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>
similarity index 94%
rename from include/asm-arm/arch-s3c2410/bast-irq.h
rename to arch/arm/mach-s3c2410/include/mach/bast-irq.h
index 726c0466f85a4160183e650fe4a7e4e81ca54246..501c202b53cf669af73be5e6013d9c4997b0c393 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-s3c2410/bast-map.h
rename to arch/arm/mach-s3c2410/include/mach/bast-map.h
index 86ac1c108db857e7323334f8661b7175c6a6888c..c2c5baf073455048fe68bf2ef46d9a966f37abae 100644 (file)
@@ -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>
similarity index 95%
rename from include/asm-arm/arch-s3c2410/bast-pmu.h
rename to arch/arm/mach-s3c2410/include/mach/bast-pmu.h
index 37a11fe54a782ed71fbb6dffc912bc3b7419b9c8..61684cb8ce590877b46072388ec848b5ed91e984 100644 (file)
@@ -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>
similarity index 96%
rename from include/asm-arm/arch-s3c2410/debug-macro.S
rename to arch/arm/mach-s3c2410/include/mach/debug-macro.S
index 89076c322726c50566858967b0ea4ea7dfb3452c..682df23087ab43134dd043cda3a83dcc85da0125 100644 (file)
@@ -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)
similarity index 99%
rename from include/asm-arm/arch-s3c2410/dma.h
rename to arch/arm/mach-s3c2410/include/mach/dma.h
index 86eaa0c2dc1ede549cee764d6fa877385e053e2c..891b53cd69b86a6a3e543fd3f3a7a34a53471bc6 100644 (file)
@@ -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.
similarity index 95%
rename from include/asm-arm/arch-s3c2410/entry-macro.S
rename to arch/arm/mach-s3c2410/include/mach/entry-macro.S
index f70d051b267b10c6d9753d039d8284f2a1f8cf5d..473b3cd37d9b393dddcd0e54838518dca916e4c4 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-s3c2410/fb.h
rename to arch/arm/mach-s3c2410/include/mach/fb.h
index 5d0262601a7eb16cee5bbb316bc47f9d49e20767..eee0654eb8fbadca38e477c306a594c95ba4f6f5 100644 (file)
@@ -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;
similarity index 91%
rename from include/asm-arm/arch-s3c2410/gpio.h
rename to arch/arm/mach-s3c2410/include/mach/gpio.h
index 18e10d2c35ead81dd58d38e31a14d7571be1888f..3b52b86498a6a4060cccaee1f720b61bb5a02674 100644 (file)
@@ -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/
similarity index 97%
rename from include/asm-arm/arch-s3c2410/h1940-latch.h
rename to arch/arm/mach-s3c2410/include/mach/h1940-latch.h
index c3de5ab102ebeffb31e75d6152f4a613c217640f..d8a832729a8a38a5ab28f44549903e707301b907 100644 (file)
@@ -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/
similarity index 91%
rename from include/asm-arm/arch-s3c2410/h1940.h
rename to arch/arm/mach-s3c2410/include/mach/h1940.h
index 6135592e60f2d1ba316d248ac2e41ce4a62a160c..4559784129c0ca13cc761b2f4d2421835f817746 100644 (file)
@@ -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>
  *
similarity index 97%
rename from include/asm-arm/arch-s3c2410/hardware.h
rename to arch/arm/mach-s3c2410/include/mach/hardware.h
index 6dd10be431458a8038908f62daa49ee4610070f8..74d5a1a4024cece53810ef96e25236de0b64a883 100644 (file)
@@ -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 */
 
similarity index 93%
rename from include/asm-arm/arch-s3c2410/idle.h
rename to arch/arm/mach-s3c2410/include/mach/idle.h
index eed450608f9c4d0aac7264942e2695bc56b2da85..e9ddd706b16e1c3cca026b80b39150b69f939c92 100644 (file)
@@ -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/
similarity index 98%
rename from include/asm-arm/arch-s3c2410/io.h
rename to arch/arm/mach-s3c2410/include/mach/io.h
index 3756c993776c0ad1ede80f8199fdbc7e5472e1ef..9813dbf2ae4f9c2f74012256422c48fda7eaebe6 100644 (file)
@@ -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
 
similarity index 99%
rename from include/asm-arm/arch-s3c2410/irqs.h
rename to arch/arm/mach-s3c2410/include/mach/irqs.h
index f5435d8c37690cace9de10370e53a413cc259a49..950c71bf14893376341e9e6ecc3768b882419993 100644 (file)
@@ -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>
similarity index 93%
rename from include/asm-arm/arch-s3c2410/leds-gpio.h
rename to arch/arm/mach-s3c2410/include/mach/leds-gpio.h
index 800846ebddba5b497dd5ce7623c9270af742e937..d8a7672519b615d1e9f856d6ad364feffd87cc07 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/map.h
rename to arch/arm/mach-s3c2410/include/mach/map.h
index b33ed3b05ef584823e3c1175924fb1f2310f48ee..64bf7e94a5bf0baac8a68008c9ed23bebef28a5d 100644 (file)
@@ -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>
similarity index 81%
rename from include/asm-arm/arch-s3c2410/memory.h
rename to arch/arm/mach-s3c2410/include/mach/memory.h
index 533e2436e70734f58c4bd111ffafc8c46971a947..93782628a786dbb476fa282614b565fcda6b5b95 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/arch-s3c2410/osiris-cpld.h
rename to arch/arm/mach-s3c2410/include/mach/osiris-cpld.h
index 229ab2351db6e1fdf3092efdcfb85ef8d37cbfa8..e9e36b0abbac2da3542cce1d1515c774ff3fa797 100644 (file)
@@ -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/
similarity index 95%
rename from include/asm-arm/arch-s3c2410/osiris-map.h
rename to arch/arm/mach-s3c2410/include/mach/osiris-map.h
index b5c74d2b9aaaa84cea710ce784e1b8d1c9fbbc20..639eff523d4ed6606b91089522774e61fb65a666 100644 (file)
@@ -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/
similarity index 94%
rename from include/asm-arm/arch-s3c2410/otom-map.h
rename to arch/arm/mach-s3c2410/include/mach/otom-map.h
index e40c934298542b436bd52f0ea9ef0f3c90c6f6fe..f9277a52c14579a1b48f9d5417ec5bc204f34050 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-clock.h
rename to arch/arm/mach-s3c2410/include/mach/regs-clock.h
index 37661358b42b006b92b79f0d098b2ec8c1270ec9..d583688458a4c8cceafe156399dbca4de4ab193d 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-dsc.h
rename to arch/arm/mach-s3c2410/include/mach/regs-dsc.h
index 1235df70f34edbb465cfef1dcdbedea47431002d..3c3853cd3cf798ed835e6033ead51b9fd31c841b 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-gpio.h
rename to arch/arm/mach-s3c2410/include/mach/regs-gpio.h
index 497dd06e2c992f5a4466317984580a9232eeb059..30bec027f5fa988a5eb1bd8d43c33d99a42d2123 100644 (file)
@@ -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/
similarity index 98%
rename from include/asm-arm/arch-s3c2410/regs-gpioj.h
rename to arch/arm/mach-s3c2410/include/mach/regs-gpioj.h
index 0362332faaf02cf324107c3d3cf3d517222bd1de..1202ca5e99f655546bd1fa87fe1aef2a3cf077d3 100644 (file)
@@ -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/
similarity index 96%
rename from include/asm-arm/arch-s3c2410/regs-irq.h
rename to arch/arm/mach-s3c2410/include/mach/regs-irq.h
index 498184cb8adcf5381af3bb757414544e17bf77b5..b057c06d167a9c4f331201abd8d93f06ceba437d 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-lcd.h
rename to arch/arm/mach-s3c2410/include/mach/regs-lcd.h
index bd854845697f314c11af21af0ae537cf43b0b661..893b8742f954ca513b270ebcb24cb6f90661f25f 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-mem.h
rename to arch/arm/mach-s3c2410/include/mach/regs-mem.h
index 312ff93b63c6da560dcf21967cda4f1488b76eca..f9926abd5cde89dffe3ec746dea3a9a405ec837a 100644 (file)
@@ -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/
similarity index 96%
rename from include/asm-arm/arch-s3c2410/regs-power.h
rename to arch/arm/mach-s3c2410/include/mach/regs-power.h
index 13d13b7cfe98165473a74b02fd8d0e868452c2b7..2d36353f57d734a59c48c858d86f66444bf59aa9 100644 (file)
@@ -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/
similarity index 93%
rename from include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h
rename to arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h
index c8c793e78936bf83ae34c014516cbb4d49d7a574..a4bf2712317093570dce33efa6221d1aca4ecb04 100644 (file)
@@ -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>
similarity index 92%
rename from include/asm-arm/arch-s3c2410/regs-s3c2412.h
rename to arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h
index 783b18f5bcea9e72a11bcc8ca721854172b26349..aa69dc79bc38e6b28b28fe89f8a0f22a4271d258 100644 (file)
@@ -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/
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
rename to arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index c1414658d1c5d757624faff55ee7431cb9369589..7dd458363a5135d2b88f9239bc8189b8b6f17c8b 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-s3c2410/regs-sdi.h
rename to arch/arm/mach-s3c2410/include/mach/regs-sdi.h
index bfb222fa4abbba6f81694ad61a259ab03c31e7e0..cbf2d8884e30403df04381c672c5597831dd1e3d 100644 (file)
@@ -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/
similarity index 92%
rename from include/asm-arm/arch-s3c2410/reset.h
rename to arch/arm/mach-s3c2410/include/mach/reset.h
index 4f866cdecab023299f1b5d545ba611dd96fe1f34..f8c9387b049d39c2c054faba58877f6c7ce27404 100644 (file)
@@ -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>
similarity index 92%
rename from include/asm-arm/arch-s3c2410/spi-gpio.h
rename to arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index 73803731142a6928bc44127d506210a61ff79db4..3fe8be9ca110e8bf40bf486a2e196b1e70ce869d 100644 (file)
@@ -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>
similarity index 93%
rename from include/asm-arm/arch-s3c2410/spi.h
rename to arch/arm/mach-s3c2410/include/mach/spi.h
index 442169887d3b0d4e810df46059b2c65ca76df64d..921b13b4f0a055dc3c036138149e6ca14db8fc89 100644 (file)
@@ -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>
similarity index 92%
rename from include/asm-arm/arch-s3c2410/system-reset.h
rename to arch/arm/mach-s3c2410/include/mach/system-reset.h
index beeec770dcf7ae39e4784b388c14a3f537f4358c..ec2defebf0d51c63909e799ccf75fb85f7bb6086 100644 (file)
@@ -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>
  * 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>
similarity index 83%
rename from include/asm-arm/arch-s3c2410/system.h
rename to arch/arm/mach-s3c2410/include/mach/system.h
index 98f690e7d33ec28e7451234eb9de209d3601cac7..e9f676bc01167c233e7c82688baf2a745519c4d8 100644 (file)
@@ -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>
  * 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>
similarity index 93%
rename from include/asm-arm/arch-s3c2410/timex.h
rename to arch/arm/mach-s3c2410/include/mach/timex.h
index c16a99c5a59a8baf7e03d9d3686d1d1d96268f0d..2a425ed0a7e0a68aed3fad05376c94b3e82d8d1b 100644 (file)
@@ -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>
similarity index 91%
rename from include/asm-arm/arch-s3c2410/uncompress.h
rename to arch/arm/mach-s3c2410/include/mach/uncompress.h
index 48a5731ee98868400793a809b515729857018160..708e47459ffc91f331804a63d08c32890a3cb41b 100644 (file)
@@ -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
similarity index 87%
rename from include/asm-arm/arch-s3c2410/usb-control.h
rename to arch/arm/mach-s3c2410/include/mach/usb-control.h
index 5bfa376e33dc4213e0cdb3fa865f3283fff0abf8..cd91d1591f31c7ae868a259d5bcc9033eae21f21 100644 (file)
@@ -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)
 
similarity index 82%
rename from include/asm-arm/arch-s3c2410/vmalloc.h
rename to arch/arm/mach-s3c2410/include/mach/vmalloc.h
index 0ae3bdb7e03b9a0a10f75ff52ea365b7e732eec0..315b0078a34d68e9f020157721cf26b836817993 100644 (file)
@@ -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/
similarity index 90%
rename from include/asm-arm/arch-s3c2410/vr1000-cpld.h
rename to arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h
index 0557b0a5ab1d5152893cd53372464763ff8549ad..e4119913d7c50e50fb5971faab47d7bb328c2763 100644 (file)
@@ -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>
similarity index 93%
rename from include/asm-arm/arch-s3c2410/vr1000-irq.h
rename to arch/arm/mach-s3c2410/include/mach/vr1000-irq.h
index 890937083c61f14c0949fb24799729b2f161cdb1..f53f85b4ad8b47b4255b5b558f4a6c5ceacd54ed 100644 (file)
@@ -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>
similarity index 97%
rename from include/asm-arm/arch-s3c2410/vr1000-map.h
rename to arch/arm/mach-s3c2410/include/mach/vr1000-map.h
index 92a56a724a8c52839f322b9219873c6ac4346ee9..99612fcc4eb20e3c1b822b48b7b407cbf2542029 100644 (file)
@@ -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)
 
index 2d72496ed09ff12b2e3a015fad5d87df2888d0b6..f0de3c23ce782e2ac024880ebff29dd33a43cacc 100644 (file)
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
index 9c76df6662a141a405f94002485e5dd279dbdf6c..fb1e78e28e50b1d30a62037cb57e23fa2c03deb9 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/bast-map.h>
-#include <asm/arch/bast-irq.h>
-#include <asm/arch/bast-cpld.h>
+#include <mach/bast-map.h>
+#include <mach/bast-irq.h>
+#include <mach/bast-cpld.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
 
 #include <asm/plat-s3c/nand.h>
 #include <asm/plat-s3c/iic.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
index f658b8421302bd9c5a070582ee29d8afb8eefdb3..e35933a46d10690c1f8da015fdaba208bca2ea55 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
 
-#include <asm/arch/h1940.h>
-#include <asm/arch/h1940-latch.h>
-#include <asm/arch/fb.h>
+#include <mach/h1940.h>
+#include <mach/h1940-latch.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c24xx/udc.h>
 
 #include <asm/plat-s3c24xx/clock.h>
index cbc7956a24e11a021eb132bf7cb081ea9f7c102a..80fe2ed0775c86513141af4ed8d2a5d953809beb 100644 (file)
 #include <linux/serial_core.h>
 #include <linux/timer.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/fb.h>
-#include <asm/arch/leds-gpio.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/fb.h>
+#include <mach/leds-gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
index 3b5dc6e81ea54d87642595af53898997f9ad7424..606ee15911b6e5d1cb20bff427fb19e58108e17c 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/otom-map.h>
+#include <mach/otom-map.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/clock.h>
index 012dc14ffb2b8552c03d8e1999e6be9e385b4761..7d34844debded6fbc865b77bbb463a0d147b74dd 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c/nand.h>
 #include <asm/plat-s3c24xx/udc.h>
-#include <asm/arch/spi.h>
-#include <asm/arch/spi-gpio.h>
+#include <mach/spi.h>
+#include <mach/spi-gpio.h>
 
 #include <asm/plat-s3c24xx/common-smdk.h>
 #include <asm/plat-s3c24xx/devs.h>
index 849ebe92adcc7a3d45b52a9400dcf8babc0ed087..c9040080727ec92d1bf123fc51a37146dcea31b4 100644 (file)
@@ -42,7 +42,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index d7646a91a1ef690065caf033cd17eaf5a7b7b726..ec87306a8c247b406dd74f7196eb06f5826cfa60 100644 (file)
@@ -39,7 +39,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index a3f60cd0bba7f057cad4cd09187d0852025b4e10..12cbca68f57d94e71f64eb1acb7e1806e23213c7 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/bast-map.h>
-#include <asm/arch/vr1000-map.h>
-#include <asm/arch/vr1000-irq.h>
-#include <asm/arch/vr1000-cpld.h>
+#include <mach/bast-map.h>
+#include <mach/vr1000-map.h>
+#include <mach/vr1000-irq.h>
+#include <mach/vr1000-cpld.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
index f44e21b9c3bab25f76577253c663a37536bf8ab5..b2ae237042a5186586a53b64f964a062cedca2cc 100644 (file)
@@ -26,9 +26,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/map.h>
-#include <asm/arch/bast-map.h>
-#include <asm/arch/bast-cpld.h>
+#include <mach/map.h>
+#include <mach/bast-map.h>
+#include <mach/bast-cpld.h>
 
 
 static void simtec_nor_vpp(struct map_info *map, int vpp)
index cb87c941fe4728f5b13d9733179a57b44a640eea..c93bf2db9f4d551aee9d4882ce9a1056097538e7 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/map.h>
+#include <mach/hardware.h>
+#include <mach/map.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
        .text
        .global h1940_pm_return
index b9087273c244e525c6e9aa94fd4be901204cb52c..ba43ff9e81646616acac13ce2de1e5a9d48e9414 100644 (file)
 #include <linux/time.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/h1940.h>
+#include <mach/regs-gpio.h>
+#include <mach/h1940.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index 54d4b7983c9522c3aee1f9c002fd1a264af7fbaf..5d977f9c88acf3cb462df6bdd0cac4bf3899653c 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 #include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
index 1597fcf9d7a174e4a72c9be2420533905400ac8c..be37f221a177b529b9da67aba5a4104a6d4b474d 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/map.h>
+#include <mach/hardware.h>
+#include <mach/map.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-mem.h>
 #include <asm/plat-s3c/regs-serial.h>
 
        /* s3c2410_cpu_suspend
index 28942e0acc982a19c1be0b01717207bf55d20c75..4dacf8a1750d3dd45acc503263b3ef1fa90f8efc 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/bast-map.h>
-#include <asm/arch/bast-irq.h>
-#include <asm/arch/usb-control.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/bast-map.h>
+#include <mach/bast-irq.h>
+#include <mach/usb-control.h>
+#include <mach/regs-gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index b1552b2e8ea883d2e50cf64fbd4d4a34d24912c1..af4b2ce516f99777340f5fe70afd91692bac6a93 100644 (file)
 
 #include <asm/mach/map.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/s3c2412.h>
 #include <asm/plat-s3c24xx/clock.h>
index 1dd8649935662383989c81cc6d90fea834152390..22fc04a3b5339b4ffa9a06fb5820395663250697 100644 (file)
 #include <linux/serial_core.h>
 
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-sdi.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
index 4f86693b05fd72f1d173c9d4e7aff9e40c583f8f..f7afece7fc38b1f304566ee0e0083b7055a999dd 100644 (file)
@@ -20,9 +20,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)
 {
index 0230b2f6353a3cd3129c98f1a31a50134aea752d..ac62b79044f4a06b83a2ad115942c2dd54ed04d6 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-power.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-power.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/irq.h>
index 7f5924713485e838274e748ebcc53e1a1a654e0c..30f613a79bfedb7ead2c164c73a25f1a11c52599 100644 (file)
 #include <asm/plat-s3c/nand.h>
 #include <asm/plat-s3c/iic.h>
 
-#include <asm/arch/regs-power.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/spi-gpio.h>
-#include <asm/arch/fb.h>
+#include <mach/regs-power.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
+#include <mach/spi-gpio.h>
+#include <mach/fb.h>
 
 #include <asm/mach-types.h>
 
index d7d0e95949c51dde1ce74d6d1acc33b07f11312d..80affb1ee4cd4c07471a29396dbed844b5c1fbe8 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
 #include <asm/setup.h>
 #include <asm/io.h>
 
 //#include <asm/debug-ll.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/idle.h>
+#include <mach/idle.h>
 #include <asm/plat-s3c24xx/udc.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2412.h>
index d7087d0dbad273c7629877e50d1ad7a7fb617bdd..7a08b37899150d736d22d214b629ab6083b7e7cc 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/idle.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c/nand.h>
 
index a71d6c6cd4477ffb31ecd0df6c688e86f4926fd0..737523a4e037dba09ab6bebb6f2116c7b823158b 100644 (file)
 #include <linux/sysdev.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-power.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-dsc.h>
+#include <mach/regs-power.h>
+#include <mach/regs-gpioj.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-dsc.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index 5ce001b5c275d63cfe2e4e42ad15659ef7ff2060..d278010b9f60ffdbf5250e4a1dbf79665dd4ffb8 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/proc-fns.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/reset.h>
-#include <asm/arch/idle.h>
+#include <mach/reset.h>
+#include <mach/idle.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-power.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
+#include <mach/regs-power.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-gpioj.h>
+#include <mach/regs-dsc.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
-#include <asm/arch/regs-s3c2412.h>
+#include <mach/regs-s3c2412.h>
 
 #include <asm/plat-s3c24xx/s3c2412.h>
 #include <asm/plat-s3c24xx/cpu.h>
index 609312b6202383a70a11794ac44ff6516601c81f..c82418ed714d5c0d6976cedb598cfd0a4ea09d85 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/map.h>
+#include <mach/hardware.h>
+#include <mach/map.h>
 
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-irq.h>
 
        .text
 
index 9ef4efd7e235d44fb2abe1b39f09ea1f9a436214..95567e6daea122be7af71b81624249e4750e576e 100644 (file)
 #include <linux/mutex.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
index 0b1260827ac674e7c9f64a2abeb7639e6568822c..cdd4e6e79ac0277859c37b9a051a09b127e9060c 100644 (file)
 #include <linux/serial_core.h>
 
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-sdi.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
 
index e7f1ca1e6730b8f44e80293483b3d13529d6a410..c0c67438d0a432c72197477cf4d35b3eaacea4b5 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-dsc.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-dsc.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
index 457255d1f08e7f56410ce6594ca64b708226bb9f..276b823f4e27f0130b3a141ec16f8e603fe46932 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index f53eba751a6c44010073ad25f81a4d132d0b20ff..265c77dec9d7577ad8af5113ee898b40edc81a71 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/anubis-map.h>
-#include <asm/arch/anubis-irq.h>
-#include <asm/arch/anubis-cpld.h>
+#include <mach/anubis-map.h>
+#include <mach/anubis-irq.h>
+#include <mach/anubis-cpld.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 
 #include <linux/mtd/mtd.h>
index 48e8fb6d18b3d9fa416c76d6ee818f9bf54c7d6b..f0f0cc6afcf469cc32e1a259ee01c0ac95092549 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 
 #include <linux/mtd/mtd.h>
index 0f4437b79ef3139b25a2dd3e47b5c2ff55244f9f..1a5e7027b41b96b1cdd12fe0bda7721a6ccb3a28 100644 (file)
 #include <asm/mach/irq.h>
 
 #include <asm/setup.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
index c4008d5c42fd4366afe20d751f16c544a26e63a5..d2ee0cd148c66f3a31c3cd02f9173118530a3bb6 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/osiris-map.h>
-#include <asm/arch/osiris-cpld.h>
+#include <mach/osiris-map.h>
+#include <mach/osiris-cpld.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 
 #include <linux/mtd/mtd.h>
index 569f00bc92969c279f1661de4a4ebd811ebafca7..e0b07e6a0a18507d9df8768acdd9068966d816fd 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/h1940.h>
+#include <mach/h1940.h>
 #include <asm/plat-s3c/nand.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
index 52deb5a6d91ce62cce89678ce7b4f4654ff60672..327c8f371984b8eedd9a0cdeee4e54543e380106 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/idle.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
index 19f06c3c26aa0fe691b2394a27a0545249e0e12a..d6b9a92d284ed09dbfdfae8475e75693ac9c2d05 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index ad2e8a929787d2aef7936bce2a4a78dea20f0200..569b5c3d334aebf20c465b2139812433baf2b3d2 100644 (file)
 #include <linux/mutex.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
index 04d248aaa7a1ca1926b252d0e1e15dda39cc74fd..6a8d7cced4a26c6244e62d45736996fc1c12af14 100644 (file)
 
 #include <asm/mach/map.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-s3c2443-clock.h>
+#include <mach/regs-s3c2443-clock.h>
 
 #include <asm/plat-s3c24xx/s3c2443.h>
 #include <asm/plat-s3c24xx/clock.h>
index f6c006d4297b4cee7999c55a3ca08b1779ed102e..c1ff03aebfda5f4b6be68dab3bddc7daa43e699f 100644 (file)
 #include <linux/serial_core.h>
 
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-sdi.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
 
index 499cddbbab41fd04332f8030e1a097412f7ed3ce..9674de7223fdba311aad83f499064f4f6575dc41 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index 5a6d33310244a61bf018b24380c032c79d24684e..e3c0d587bd10c20eeee945094d96b28a5e918637 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/idle.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
index 3e9f92383ed5afebe40df6d577cf5d4d5f3027b5..37793f924b5e34f8a6318a08c670225c2b9a3996 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-s3c2443-clock.h>
-#include <asm/arch/reset.h>
+#include <mach/regs-s3c2443-clock.h>
+#include <mach/reset.h>
 
 #include <asm/plat-s3c24xx/s3c2443.h>
 #include <asm/plat-s3c24xx/devs.h>
index d219845b10b89e4f9b4b4811970b2de3de6ba3f5..55e64477a87620de602964da3573f822dea1a516 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -34,8 +34,8 @@
 #include <asm/mach/irda.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/assabet.h>
-#include <asm/arch/mcp.h>
+#include <mach/assabet.h>
+#include <mach/mcp.h>
 
 #include "generic.h"
 
index d087c3bf3feb22ed817dafab8d36fe642e2568c4..3efefbdd2527ee966377020bb2add9a08828e09a 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/errno.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
@@ -34,7 +34,7 @@
 #include <asm/hardware/sa1111.h>
 #include <asm/mach/serial_sa1100.h>
 
-#include <asm/arch/badge4.h>
+#include <mach/badge4.h>
 
 #include "generic.h"
 
index cfb65eb9f304f4a702641869e4ffe559a114c263..fd3ad9cfc9125683c792847ff5a5d43d087f0364 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 
 #include <asm/mach-types.h>
@@ -28,8 +28,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
 
-#include <asm/arch/cerf.h>
-#include <asm/arch/mcp.h>
+#include <mach/cerf.h>
+#include <mach/mcp.h>
 #include "generic.h"
 
 static struct resource cerfuart2_resources[] = {
index dbd1aaaa09a2b8f1e9887a03fdb1ebd503472f8a..43c30f84abf2b05c6a6212948bb4069d0f5904ea 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * Very simple clock implementation - we only have one clock to
index 40893638be7017043bc4415c8c986885ae03c451..fe289997cfaf5942fade071d26b92574001ff95b 100644 (file)
 #include <linux/mtd/partitions.h>
 #include <linux/timer.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
-#include <asm/arch/collie.h>
+#include <mach/collie.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
@@ -40,7 +40,7 @@
 #include <asm/hardware/scoop.h>
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/locomo.h>
-#include <asm/arch/mcp.h>
+#include <mach/mcp.h>
 
 #include "generic.h"
 
index daa9d57c00faad99b818133c298a218b5cf16a27..b1161fc80602121fdf0530f2c0fa6678200e12a6 100644 (file)
 #include <linux/platform_device.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/scoop.h>
 #include <asm/dma.h>
-#include <asm/arch/collie.h>
+#include <mach/collie.h>
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/sharpsl_pm.h>
 
index 61df76f85268f6318450984b10701b3f8ae7e073..da3a898a6d66e70c115a7e904efe7cede6ae8a39 100644 (file)
@@ -88,7 +88,7 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "generic.h"
 
index a471f9f62731250eecab735823778d0c90c91c33..39d38c8017369328652bcab4a985be4d9c9a5061 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/system.h>
index 65d96eec9e600ce361bb8d236b549602c77fe0d7..f990a3e858462d6324d85e469e50ea2d66604c1c 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 
 
@@ -76,7 +76,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
  *     address of the hardware registers for that channel as the channel
  *     identifier. This identifier is written to the location pointed by
  *     @dma_regs. The list of possible values for @device are listed into
- *     linux/include/asm-arm/arch-sa1100/dma.h as a dma_device_t enum.
+ *     arch/arm/mach-sa1100/include/mach/dma.h as a dma_device_t enum.
  *
  *     Note that reading from a port and writing to the same port are
  *     actually considered as two different streams requiring separate
index e616130ae5291da6eaf55247fe5a30a0051a6e6e..5a08fe20a31934c06aeef301b7182e6de4384128 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <asm/div64.h>
 #include <asm/cnt32_to_63.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
index 184b04c0072aae6b192f570f6544231856488815..0d3829a8c2c1df94cd2e8ceb3ef8aa751291a336 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "generic.h"
 
 static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)
index 8c560ae0869cee9dd990017b9af6fd73a7fd4157..af25a78d705d677e6d58e8dfa2223f3aeda35d8c 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/serial_core.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
 
-#include <asm/arch/h3600.h>
+#include <mach/h3600.h>
 
 #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100)
-#include <asm/arch/h3600_gpio.h>
+#include <mach/h3600_gpio.h>
 #endif
 
 #ifdef CONFIG_SA1100_H3800
-#include <asm/arch/h3600_asic.h>
+#include <mach/h3600_asic.h>
 #endif
 
 #include "generic.h"
@@ -681,7 +681,7 @@ static struct ipaq_model_ops h3800_model_ops __initdata = {
 
 #define MAX_ASIC_ISR_LOOPS    20
 
-/* The order of these is important - see #include <asm/arch/irqs.h> */
+/* The order of these is important - see #include <mach/irqs.h> */
 static u32 kpio_irq_mask[] = {
        KPIO_KEY_ALL,
        KPIO_SPI_INT,
index 270feb0fa4acf60d8af08f89b37fe86d5bbffab4..e7056c0b562c2017377284bdcce635ee6858edbf 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 #include <asm/page.h>
similarity index 99%
rename from include/asm-arm/arch-sa1100/SA-1101.h
rename to arch/arm/mach-sa1100/include/mach/SA-1101.h
index 65ca8c79e6d21f757bfa1a429bc616602a39234f..5d2ad7db991c5148dc1a9c70ac89a6c188db4bc2 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-sa1100/assabet.h
rename to arch/arm/mach-sa1100/include/mach/assabet.h
index d6a1bb5b494484065aee1d5dfab8877a108c7750..3959b20d5d1c221358a330844f3143b4b2b0ef55 100644 (file)
@@ -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>
  *
similarity index 96%
rename from include/asm-arm/arch-sa1100/badge4.h
rename to arch/arm/mach-sa1100/include/mach/badge4.h
index d93a9a83b25d0b0e1d850a516673fe3299edf580..44d2e1bfc04b258d7f80a5e522fb186d960aa50e 100644 (file)
@@ -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)
similarity index 94%
rename from include/asm-arm/arch-sa1100/cerf.h
rename to arch/arm/mach-sa1100/include/mach/cerf.h
index 9a19c3d07c1e50f95ce634b1e7dc3e773fd2846a..c3ac3d0f946594f69372d1b0f285d72031a74e17 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-sa1100/collie.h
rename to arch/arm/mach-sa1100/include/mach/collie.h
index 762eba535813bda189cb392619020d67534cf4fd..69e962416e3fc994c6c31b57ea14f650b8a90458 100644 (file)
@@ -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.
similarity index 90%
rename from include/asm-arm/arch-sa1100/debug-macro.S
rename to arch/arm/mach-sa1100/include/mach/debug-macro.S
index 1b7753654bd44926207bd53d1bc59610131cf69b..1f0634d92702a29c3540d59356d5cc5afd841e85 100644 (file)
@@ -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
similarity index 98%
rename from include/asm-arm/arch-sa1100/dma.h
rename to arch/arm/mach-sa1100/include/mach/dma.h
index 6b7917a2e77a957acdb0a0cb55f4718ea2c2d1e4..dda1b351310d3c1b80ecb4e39d4c171076ee215d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-sa1100/dma.h
+ * arch/arm/mach-sa1100/include/mach/dma.h
  *
  * Generic SA1100 DMA support
  *
similarity index 95%
rename from include/asm-arm/arch-sa1100/entry-macro.S
rename to arch/arm/mach-sa1100/include/mach/entry-macro.S
index 127db4aaf4f2887300f7c045e787e06949cda706..6aa13c46c5d318b74094dae8bc80e8effd7233cc 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-sa1100/gpio.h
rename to arch/arm/mach-sa1100/include/mach/gpio.h
index e66ecf74e807413e673e0b1f871f0c58948069ca..582a0c92da53c74d73f6fce5b09c7dee1b08ddd8 100644 (file)
@@ -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>
 
similarity index 96%
rename from include/asm-arm/arch-sa1100/hardware.h
rename to arch/arm/mach-sa1100/include/mach/hardware.h
index 1abd7cfc8bcef4817cc19eaa2573ee18dcf5695a..5976435f42c294c008d25d10518577371476b55d 100644 (file)
@@ -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>
  *
similarity index 95%
rename from include/asm-arm/arch-sa1100/ide.h
rename to arch/arm/mach-sa1100/include/mach/ide.h
index 24972f30195af9d933da5f369840e8cf622a7d34..4c99c8f5e6172dd9587fdf318e813712aaf730d7 100644 (file)
@@ -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"
similarity index 92%
rename from include/asm-arm/arch-sa1100/io.h
rename to arch/arm/mach-sa1100/include/mach/io.h
index 0756269404b18085bd8c25d61a091f0697983e17..0c070a6149bcb4a845c8b35360d9eecefdff76c6 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-sa1100/irqs.h
rename to arch/arm/mach-sa1100/include/mach/irqs.h
index 7bf80484bb77ad6dafeab8befa48be648efd29da..0cb36609b3acddad08f5962323882d209b4c28b8 100644 (file)
@@ -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).
similarity index 93%
rename from include/asm-arm/arch-sa1100/jornada720.h
rename to arch/arm/mach-sa1100/include/mach/jornada720.h
index 45d2bb59f9d050846538fb8b51bb0088e8eaa02e..bc120850d313c1ea44e88fa99b76f93f833e6be9 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-sa1100/mcp.h
rename to arch/arm/mach-sa1100/include/mach/mcp.h
index f58a22755c614ac3a6aa62a9a57f8ece7e1bc59a..fb8b09a57ad70decaf9d9504ccca75457d202379 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-sa1100/memory.h
rename to arch/arm/mach-sa1100/include/mach/memory.h
index 0e907fc6d42a5694c27905de849b092ed783f3eb..29f639e2afc6a1180004e115fd2e3eaa58170372 100644 (file)
@@ -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>
  */
similarity index 98%
rename from include/asm-arm/arch-sa1100/neponset.h
rename to arch/arm/mach-sa1100/include/mach/neponset.h
index 09ec9e2bd1820ba488e87f877b1939f567088980..d3f044f92c00e943d0241b48213dbf2fc61a5238 100644 (file)
@@ -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>
  *
similarity index 98%
rename from include/asm-arm/arch-sa1100/simpad.h
rename to arch/arm/mach-sa1100/include/mach/simpad.h
index 034301d23f60f19482dfe0544f2d708947cc0b49..9296c4513ce14289ae28a0a047dad467ef05f7f0 100644 (file)
@@ -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
  *
similarity index 79%
rename from include/asm-arm/arch-sa1100/system.h
rename to arch/arm/mach-sa1100/include/mach/system.h
index 63375a0c01454cad7566e8af2af12db3414f22e4..63755ca5b1b49a5c457f4efd3d205a06f76ad695 100644 (file)
@@ -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)
 {
similarity index 75%
rename from include/asm-arm/arch-sa1100/timex.h
rename to arch/arm/mach-sa1100/include/mach/timex.h
index 837be9b797dd0a572e5ac6a3118ef465f971c886..7a5d017b58b3980e2c5c907e53441d493d035b02 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-sa1100/timex.h
+ * arch/arm/mach-sa1100/include/mach/timex.h
  *
  * SA1100 architecture timex specifications
  *
similarity index 95%
rename from include/asm-arm/arch-sa1100/uncompress.h
rename to arch/arm/mach-sa1100/include/mach/uncompress.h
index 17e64d232e7dfcb7831ffe488de2bf709eb7572f..714160b03d7a7dd2a9163115e44c000ca9260291 100644 (file)
@@ -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/arch/arm/mach-sa1100/include/mach/vmalloc.h b/arch/arm/mach-sa1100/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..ec8fdc5
--- /dev/null
@@ -0,0 +1,4 @@
+/*
+ * arch/arm/mach-sa1100/include/mach/vmalloc.h
+ */
+#define VMALLOC_END       (0xe8000000)
index 280e111ba069fa2893ec726d9e17effec37f41fc..86369a8f0cea79696ddb2256401cf0be221f2ac2 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 
 #include "generic.h"
index 2fefd195375eac2670815d5e799e0ae0eeffbd62..81848aa9642418f51d775d13b461a9f2979ae63a 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <video/s1d13xxxfb.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index e319c361fc6c65780948101268a80d62b7439820..06ea7abd917009401e3bc1e5d0498ec8ed705507 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/ssp.h>
-#include <asm/arch/jornada720.h>
+#include <mach/jornada720.h>
 
 static DEFINE_SPINLOCK(jornada_ssp_lock);
 static unsigned long jornada_ssp_flags;
index 7b991217a7f790cd27c5d2d129c61044b572d1ed..0cd52692d2f768241f3d2799a2ee8c3eb3394194 100644 (file)
@@ -6,14 +6,14 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/mcp.h>
+#include <mach/mcp.h>
 
 #include "generic.h"
 
index 0af944ea1b642fcebdaddf040717d78c95a9885e..64e9b4b11b5454b83f192b93ac0b8ff0b5782d66 100644 (file)
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
-#include <asm/arch/assabet.h>
+#include <mach/assabet.h>
 
 #include "leds.h"
 
index 9aead5f0a506b56c01f4e010deabf555d6214f36..cf1e38458b81c939ae3cf518a5c01ae687b02d79 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
index 0c61ce5fddd02e895b7ce897d1b48c311ae75ffd..259b48e0be895b5b3c6ffcf50178b56c02a0b57f 100644 (file)
@@ -5,7 +5,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
index afa82f40048043bab41f5c2e5a311e11f1617848..2bce137462e46a5b5ffa7753256fc841ed484350 100644 (file)
@@ -11,7 +11,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
index 066c7dc2f3f16ae6d7a81247003b4c95a1b6695d..0505a1fdcdb2b98f203d0db244fcf57aac12e1da 100644 (file)
@@ -11,7 +11,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 
index 1a3564b97e4abd952ab8c8aa0d6fa422bf3a8473..d50f4eeaa12ee5045282eca6d2b96cc18b59fa42 100644 (file)
@@ -5,10 +5,10 @@
  */
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
-#include <asm/arch/simpad.h>
+#include <mach/simpad.h>
 
 #include "leds.h"
 
index dd7949f4f57790c6ab82d0f091d7b6b14a91c690..4856a6bd24824d75b09bd0d0bbbd7d2c3641f13e 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/assabet.h>
-#include <asm/arch/neponset.h>
+#include <mach/assabet.h>
+#include <mach/neponset.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/sizes.h>
 
index 84e956e23597f32d9d8906e8b26d6e093f45a82b..83be1c6c5f80a731f0996714f67da037c399c273 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -20,7 +20,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 #include "generic.h"
 
index 41ac21057b7837dee30c13e989c39524d6e0f5ea..111cce67ad2fa8f33d97a4101ce70d44d3d880e5 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/errno.h>
 #include <linux/time.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/memory.h>
 #include <asm/system.h>
 #include <asm/mach/time.h>
index 60b4d847b489a8c4798fb465161dd501df8872e0..9ccdd09cf69f4d1276536331edf9473aee0a9f2b 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 
@@ -17,8 +17,8 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/mcp.h>
-#include <asm/arch/shannon.h>
+#include <mach/mcp.h>
+#include <mach/shannon.h>
 
 #include "generic.h"
 
index cc1df0703fca4e22aa3c33556c31e9843ccd81c7..8dd63531795928d394db43f96fe24e004c983136 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/setup.h>
 
 #include <asm/mach-types.h>
@@ -22,8 +22,8 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/mcp.h>
-#include <asm/arch/simpad.h>
+#include <mach/mcp.h>
+#include <mach/simpad.h>
 
 #include <linux/serial_core.h>
 #include <linux/ioport.h>
index 29bdd3d1d1f7c7ad3e09c6ae7034503a59a22170..171441f967100ce76d11f766e995bb37f28e1140 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 
 
index db491659c8c1c7269bd761dd12a343ac97a5f488..641f361c56f4858e15763a240e70909e80a08e7a 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/ssp.h>
 
 #define TIMEOUT 100000
index 428c2127834a5eb9d8f3a89715dd9e3ace2d8272..24c0a4bae850ec273854557d50891bfe6a2ee46b 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/clockchips.h>
 
 #include <asm/mach/time.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define MIN_OSCR_DELTA 2
 
similarity index 92%
rename from include/asm-arm/arch-shark/debug-macro.S
rename to arch/arm/mach-shark/include/mach/debug-macro.S
index 7cb37f78825e494588c6f12ee0163f626b933c96..0836cb78b29ac5549e1c3b76858140895937d368 100644 (file)
@@ -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
  *
similarity index 88%
rename from include/asm-arm/arch-shark/dma.h
rename to arch/arm/mach-shark/include/mach/dma.h
index fc985d5e62af8ce9ec41fefc2e46a1aad9903719..c0a29bd2a74fba1fcb26cf182bb68978fd33855c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-shark/dma.h
+ * arch/arm/mach-shark/include/mach/dma.h
  *
  * by Alexander Schulz
  */
similarity index 95%
rename from include/asm-arm/arch-shark/entry-macro.S
rename to arch/arm/mach-shark/include/mach/entry-macro.S
index 82463f30f3dfc7e02dcbbafd270e352aa1c1a048..e2853c0a3333bc403749a231196d06b4f3ea56c1 100644 (file)
@@ -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
  *
similarity index 89%
rename from include/asm-arm/arch-shark/hardware.h
rename to arch/arm/mach-shark/include/mach/hardware.h
index ecba45260898d029b0a28f26e269a63e1defb859..cb0ee2943c1acb13bbc44cbeefe6303a47e1e998 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-shark/io.h
rename to arch/arm/mach-shark/include/mach/io.h
index b11d7860a9d3801215906091c7ef8557212dcc84..92475922c068fc7bdd20e8a79b2ed4feba4deecc 100644 (file)
@@ -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
 
similarity index 81%
rename from include/asm-arm/arch-shark/irqs.h
rename to arch/arm/mach-shark/include/mach/irqs.h
index b36cc975b29020c64d19bb1efe42e7425fd12034..0586acd7cdd5f563ba178cdb0421d290d9de04ac 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-shark/irqs.h
+ * arch/arm/mach-shark/include/mach/irqs.h
  *
  * by Alexander Schulz
  */
similarity index 90%
rename from include/asm-arm/arch-shark/memory.h
rename to arch/arm/mach-shark/include/mach/memory.h
index 6968d6103ea00b8386163184e1b64a98c151e201..b7874ad9f9f6dd66357e4292710ec8014dcd77af 100644 (file)
@@ -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
similarity index 89%
rename from include/asm-arm/arch-shark/system.h
rename to arch/arm/mach-shark/include/mach/system.h
index f12d771ab4ce50de011e10656c6608890ee593e7..85aceef6f87459bc7e75c7983bbe7c091f56b5ab 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-shark/system.h
+ * arch/arm/mach-shark/include/mach/system.h
  *
  * by Alexander Schulz
  */
similarity index 60%
rename from include/asm-arm/arch-shark/timex.h
rename to arch/arm/mach-shark/include/mach/timex.h
index 0d02d255513b3c8a275ea1a898cc709b7b2890c8..bb6eeaebed86625c4754c581d3b0d1da9088b5fa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-shark/timex.h
+ * arch/arm/mach-shark/include/mach/timex.h
  *
  * by Alexander Schulz
  */
similarity index 85%
rename from include/asm-arm/arch-shark/uncompress.h
rename to arch/arm/mach-shark/include/mach/uncompress.h
index 7eca6534f1bb33e5abbd68c30e900a56d7695715..3725e16334186013f1c50b41961c1b92c8c1c1c9 100644 (file)
@@ -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
  */
 
similarity index 56%
rename from include/asm-arm/arch-shark/vmalloc.h
rename to arch/arm/mach-shark/include/mach/vmalloc.h
index fac37c636b38fa4dadc756d314203e0812d3cb5a..f6c6837c5451888257a86601ae8031a9d0a598d5 100644 (file)
@@ -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)
index 5b0c6af44ec69e2a36307dd60daf11717abd6ea4..44b0811b400cc2a89a3f6ad08e2534b137a1973f 100644 (file)
@@ -4,7 +4,7 @@
  * by Alexander Schulz
  *
  * derived from linux/arch/ppc/kernel/i8259.c and:
- * include/asm-arm/arch-ebsa110/irq.h
+ * arch/arm/mach-ebsa110/include/mach/irq.h
  * Copyright (C) 1996-1998 Russell King
  */
 
index 333ece0aad49611544e71729c5c7cc34a059e5f8..b1896471aa3c88f39887f7584ff98f00bd834679 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/spinlock.h>
 #include <linux/ioport.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/io.h>
 #include <asm/system.h>
index 12097f441a8affcde50ebe9ba3693d5f68deb1f5..d75e795c893e494b725f4ad177350651e32a60e6 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <asm/cnt32_to_63.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/leds.h>
similarity index 91%
rename from include/asm-arm/arch-versatile/debug-macro.S
rename to arch/arm/mach-versatile/include/mach/debug-macro.S
index fe106d184e62de201b8d150a7fb74dd50a589756..b4ac00eacf6876fa69719f47537f9a1899b8ff93 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-versatile/dma.h
rename to arch/arm/mach-versatile/include/mach/dma.h
index 6425773486239ab0fced894ae331cc9cccd30d0a..0aabf12c8834015a964ea0ec873fe8d527f60a32 100644 (file)
@@ -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
similarity index 92%
rename from include/asm-arm/arch-versatile/entry-macro.S
rename to arch/arm/mach-versatile/include/mach/entry-macro.S
index cd114169c3e6c302828ccdfb683669166ac865ef..8c802098058509e491a0ac31a788a813031a48bc 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-versatile/hardware.h
rename to arch/arm/mach-versatile/include/mach/hardware.h
index edc06598d187d4664f891f519d98a59b8669b924..7aa906c93154327dfe276ccbf9ff0f822c189f38 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-versatile/io.h
rename to arch/arm/mach-versatile/include/mach/io.h
index c4d01948e00bccd8a25ac33693c50c9910d67e29..c0b9dd1d025759a4d893fefc9ac73c065aa57523 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-versatile/irqs.h
rename to arch/arm/mach-versatile/include/mach/irqs.h
index f7263b99403b9b8cfc5cd014300b882a81fd6c28..216a1312e62ed890034a913018f64d2b26c93197 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-versatile/memory.h
rename to arch/arm/mach-versatile/include/mach/memory.h
index a9370976cc5ef0adfed704f2fe6bd29b72cc7ea2..b6315c0602ac5f6d0860ff5c6b1f4c86adcb189a 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-versatile/platform.h
rename to arch/arm/mach-versatile/include/mach/platform.h
index 2af9d7c9c63c32d6dea9f109b1241ff49316d7cf..27cbe6a3f2208f5abf4e4f33ce024b8c1498023e 100644 (file)
@@ -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.
  *
similarity index 92%
rename from include/asm-arm/arch-versatile/system.h
rename to arch/arm/mach-versatile/include/mach/system.h
index 3ea4e07b58c842f0b9555352c918de49ab8a711b..91fa559c7cca3e6097369a47391e4d276e5f9a6d 100644 (file)
@@ -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)
 {
similarity index 94%
rename from include/asm-arm/arch-versatile/timex.h
rename to arch/arm/mach-versatile/include/mach/timex.h
index 38fd04fc9141652241e1725cc29a707a635966c0..426199b1add5319d650dc2f67ddb1a6731210b28 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-versatile/timex.h
+ *  arch/arm/mach-versatile/include/mach/timex.h
  *
  *  Versatile architecture timex specifications
  *
similarity index 96%
rename from include/asm-arm/arch-versatile/uncompress.h
rename to arch/arm/mach-versatile/include/mach/uncompress.h
index 7215133d0514202cb6d4438d46f2a79785c742da..3dd0048afb349e67ab4103daa11c76d3afca6532 100644 (file)
@@ -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
  *
similarity index 94%
rename from include/asm-arm/arch-versatile/vmalloc.h
rename to arch/arm/mach-versatile/include/mach/vmalloc.h
index ac780df62156bb611046ca6e7853680b4be3d1dc..427e3612db5d1f48202cae06b310c1b9f5f03477 100644 (file)
@@ -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.
index 4335c07b86524ef54414c0a9fc038fcb4c474276..36f23f8965034a50ea3a4fd2de3c38c71f9fe13a 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
index 6e1fe3b450d4499ab97acf20d6f7df1e2fb3abc1..76375c64413ac010175cbf43381055f775878752 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index 2eeda4b0107d6d2be95e77250ba5eb42daf4d59f..1725f019fc8581bec6332efecdc1d0933cdd5fa9 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index 3e8d8c7985625f8b96c28e3dab8c702aa8114f1d..3b3639eb7ca53c86e82184db943e29a06038dbc7 100644 (file)
@@ -9,7 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
index 8e23c8d69e7aae5cbb26329bf5bad2739642efb5..33926c9fcda696d0670014a406e5ad292154887e 100644 (file)
@@ -9,7 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
index d67829f00ee7733bb283be99430ebdfbe2d304f9..51a9b0b273b6f47ac7261591964e7463a6fbcbf1 100644 (file)
@@ -13,7 +13,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
index d05e2358b8248dbe8d085dae926f858ce89eca0d..bbe10576c861d2c6f117fb79e2ae9d1a37fcab2a 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/elf.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
index 56bd3bfa294224e37b7bc9429eabcabe9c1bdea8..871ba018252e4f5b67360c7722935f56b9f1ee83 100644 (file)
@@ -23,7 +23,7 @@
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/elf.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 
index 6a0adecfe0ed207e9b68755e224135005e2c365a..7bd9e7197f607773b5fa41bc0fb740f707f3e1b1 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/elf.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/page.h>
index 65e26c17f8a2af5a8aabd29e87a792a765d97b62..92db6e035c65ddaa1731a0f51ba1a39d10064b0e 100644 (file)
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 
 #include "op_counter.h"
index 53c5e9a52eb1af9f8c4267a8184c0e080a94dd0e..f724208216199ef8ae3b1e5228b70c7d48ba7f60 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <asm/hardware/iop3xx.h>
 #include <linux/dma-mapping.h>
-#include <asm/arch/adma.h>
+#include <mach/adma.h>
 #include <asm/hardware/iop_adma.h>
 
 #ifdef CONFIG_ARCH_IOP32X
index b7b8fcb9108cfe3f6f67f89b07bedf1b0acf4408..6dcbcc4ad4196068a85d81e4f6c140734c86f7f4 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/memory.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iop3xx.h>
 #include <asm/mach/arch.h>
 
index c30d1885af3d5c356eb419cf35be832d8cfe9aa2..39dcfb4bdc716f09e7fe70b180917991b93537d7 100644 (file)
@@ -18,7 +18,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,
index e32054fbe52432382aca4ef4b8702aadf06205e5..54708bf9cb155c2b4a2589f92387c6ea63185268 100644 (file)
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 #include <asm/signal.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/pci.h>
 #include <asm/hardware/iop3xx.h>
 
index da9e82441c536d579c7aa0b669a6526c8582f200..c53fefb6aac4c5cf521d4ba44c8210469204cdcc 100644 (file)
 #include <linux/time.h>
 #include <linux/init.h>
 #include <linux/timex.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include <asm/arch/time.h>
+#include <mach/time.h>
 
 static unsigned long ticks_per_jiffy;
 static unsigned long ticks_per_usec;
index 1aa86fd60d711a2ba7c70200fff77253cf1e1ed0..2f8627218839130ccdba3c23c5f1d6b968b190f6 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/string.h>
 #include <linux/version.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
index 73d3046336422fcf4c67fd6420dd8a96a4b91053..733e0acac91673621b9207db751e5ddd5b2333ac 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm-generic/bug.h>
 
 static struct mxc_gpio_port *mxc_gpio_ports;
similarity index 77%
rename from include/asm-arm/arch-mxc/debug-macro.S
rename to arch/arm/plat-mxc/include/mach/debug-macro.S
index 575087f8561a510d9fb4c016a0d9e033345b2282..b9907bebba3bab9acc3f63693120fda3b6604ff1 100644 (file)
@@ -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
  *
  *
  */
 
-#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
similarity index 97%
rename from include/asm-arm/arch-mxc/gpio.h
rename to arch/arm/plat-mxc/include/mach/gpio.h
index 5f13a65e4044ef9a8238aa769dee89948b37cf78..65eedc0d196fcfcd0b7c00bc29024b4ffef3c1d0 100644 (file)
@@ -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 */
similarity index 92%
rename from include/asm-arm/arch-mxc/hardware.h
rename to arch/arm/plat-mxc/include/mach/hardware.h
index 37cddbaaade7de5763cefe51b878d4d724961968..3caadeeda701165b8a693a6bd95f10b6034e34d0 100644 (file)
 #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__ */
similarity index 92%
rename from include/asm-arm/arch-mxc/irqs.h
rename to arch/arm/plat-mxc/include/mach/irqs.h
index 21411efc10fb0f760f0f977cbb84a0c51da06195..228c4f68ccdf1bce6fcaa8a7a1f56bd4689bc716 100644 (file)
@@ -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__ */
similarity index 96%
rename from include/asm-arm/arch-mxc/memory.h
rename to arch/arm/plat-mxc/include/mach/memory.h
index 7e669ee0d6342dc0610dba99cbc21b186fb6a31d..d7a8d3ebed576c8af5a88cdfe5c9ad9e90a7735a 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-mxc/mxc_timer.h
rename to arch/arm/plat-mxc/include/mach/mxc_timer.h
index 5439fa6cf61534c7514cefeb799c4f2f8ef140eb..130aebfbe168024f15851bf302cc49d4ee9eb525 100644 (file)
@@ -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)
similarity index 94%
rename from include/asm-arm/arch-mxc/timex.h
rename to arch/arm/plat-mxc/include/mach/timex.h
index 432e0c84c509af975d65fe2eec5e9219858778f0..0b0af0253e912124d69cb4eacaedf7c1703b2ecf 100644 (file)
@@ -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__ */
similarity index 96%
rename from include/asm-arm/arch-mxc/uncompress.h
rename to arch/arm/plat-mxc/include/mach/uncompress.h
index 18f33b0cdeb212e461877a36366e326dc8fe91be..de6fe0365982138e7e3955b5ff471a3da00bf15a 100644 (file)
@@ -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)))
 
index 1204456d61a96c8b8984f54d26d5baf37db4dd08..d97387aa9a42f9e87d756832374cc79cca1efe00 100644 (file)
@@ -30,9 +30,9 @@
 #include <linux/string.h>
 #include <linux/gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/map.h>
-#include <asm/arch/iomux-mx1-mx2.h>
+#include <mach/iomux-mx1-mx2.h>
 
 void mxc_gpio_mode(int gpio_mode)
 {
index 1fbe01da6925ccd3f5d419532047ad920992aef2..1053b666c676fd5217226fd3301ca90d23ca6e3f 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <linux/irq.h>
 #include <asm/io.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
 
 #define AVIC_BASE              IO_ADDRESS(AVIC_BASE_ADDR)
 #define AVIC_INTCNTL           (AVIC_BASE + 0x00)      /* int control reg */
index be9680a88b026765e57ff05eef43f4fcc21463c0..fd28f5194f71ad3bd1a09b05545c2d01e8ea17c6 100644 (file)
 #include <linux/clockchips.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/time.h>
-#include <asm/arch/common.h>
-#include <asm/arch/mxc_timer.h>
+#include <mach/common.h>
+#include <mach/mxc_timer.h>
 
 static struct clock_event_device clockevent_mxc;
 static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;
index c2e741de020338385383f07f49afeb19e19e887a..23a07059999307a0569fac8f1e942ededa6c2460 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
index 6a955296e8c1565d326ae233a535548b40a66f3e..f4dff423ae7c19569adf3302f7851a527b595360 100644 (file)
 #include <linux/serial_reg.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/board.h>
-#include <asm/arch/control.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
+#include <mach/common.h>
+#include <mach/board.h>
+#include <mach/control.h>
+#include <mach/mux.h>
+#include <mach/fpga.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 # include "../mach-omap2/sdrc.h"
index 3c8ef1ac5f3d2b0c5fd0a2e7076f575f287349bb..ae1de308aaad2e5c9db136e8c9ed3d4841db976d 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
index 7228ef8534b72bd833ae9b6b0e977adc34bce053..5b73bb274452b9b55b4567082bbd16a208044033 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 
 
 /* Many OMAP development platforms reuse the same "debug board"; these
index a47695c3171aa5051144a30a41963054afc1bb6a..9422dee7de84e778739d61fdb6dad2d2c984f847 100644 (file)
 #include <linux/leds.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/gpio.h>
+#include <mach/fpga.h>
+#include <mach/gpio.h>
 
 
 /* Many OMAP development platforms reuse the same "debug board"; these
index 9b4240b9d65f2c70c2000fbf90fc078fb89bf1b8..187e3d8bfdfe89512a454c128b0de4d8cb97a3b6 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/tc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/tc.h>
+#include <mach/board.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/menelaus.h>
+#include <mach/mcbsp.h>
 
 #if    defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
 
index 69450d61cf4f7d14c45f8f539f1fc07e74aedb12..a63b644ad30574b024f4ff60146f9233b7fa17db 100644 (file)
 #include <linux/io.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 
-#include <asm/arch/tc.h>
+#include <mach/tc.h>
 
 #undef DEBUG
 
index 30b6f2c9cb333324ecdb92148a13849bf749d43a..743a4abcd85d99f6a23bb897be2315b57012fc6f 100644 (file)
 #include <linux/list.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/hardware.h>
+#include <mach/dmtimer.h>
 #include <asm/io.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
 /* register offsets */
 #define _OMAP_TIMER_ID_OFFSET          0x00
index b0b3c5419b0a71f4800daa0ba749bd318aea064b..17a92a31e74670213ce0196d8e17107f2589f3bd 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/bootmem.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/omapfb.h>
+#include <mach/board.h>
+#include <mach/sram.h>
+#include <mach/omapfb.h>
 
 #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
 
index 7112b5db4a36ee8f7dfb1c10f123d35f9c0d34a1..3e76ee2bc731dfd91d7e6fb00461a9a43e9b6c55 100644 (file)
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/gpio.h>
+#include <mach/irqs.h>
+#include <mach/gpio.h>
 #include <asm/mach/irq.h>
 
 #include <asm/io.h>
index 647ed5971c60e089ba607a0fcac58357850cf110..0e6d147ab6f82ed8158a3eec98be3981faa1ddbe 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 #define OMAP_I2C_SIZE          0x3f
 #define OMAP1_I2C_BASE         0xfffb3800
similarity index 98%
rename from include/asm-arm/arch-omap/aic23.h
rename to arch/arm/plat-omap/include/mach/aic23.h
index aec2d65636229a5a49b05e970481eaf2386986db..5ccedac775268aa4b197a1ce1e9394a4a8db7816 100644 (file)
@@ -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
  *
similarity index 96%
rename from include/asm-arm/arch-omap/board-2430sdp.h
rename to arch/arm/plat-omap/include/mach/board-2430sdp.h
index c7db9004ec31099da99c4b2a262d5a5694d5dcb8..cf1dc02239495a8a1f2762d4eba8290c01f4d856 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-omap/board-ams-delta.h
rename to arch/arm/plat-omap/include/mach/board-ams-delta.h
index 9aee15d97145df25e9c2b32f1e56a510e64aa192..51b102dc906b62bee9241aa65a9325048ce69d21 100644 (file)
@@ -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>
  *
similarity index 96%
rename from include/asm-arm/arch-omap/board-apollon.h
rename to arch/arm/plat-omap/include/mach/board-apollon.h
index 547125a4695e0bbf94c503c2ad6414f64009616b..d6f2a8e963d5c86340bec27d604217699341de04 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-omap/board-fsample.h
rename to arch/arm/plat-omap/include/mach/board-fsample.h
index 89a1e529fb6f1a4e34b454928bffdfb15d188da1..cb3c5ae12776673cfb7ad83ca5f05868549b8249 100644 (file)
@@ -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)
similarity index 97%
rename from include/asm-arm/arch-omap/board-h2.h
rename to arch/arm/plat-omap/include/mach/board-h2.h
index c322796d0d26ce94d60b841f491ddfb326ab4e78..2a050e9be65f9089612eaadef6446831e891b293 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-omap/board-h3.h
rename to arch/arm/plat-omap/include/mach/board-h3.h
index c5d0f32a40ac2db18c3767767b280488ed2ff014..14909dc7858a397d23c23be0e3b5bec1aec02e61 100644 (file)
@@ -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.
similarity index 96%
rename from include/asm-arm/arch-omap/board-h4.h
rename to arch/arm/plat-omap/include/mach/board-h4.h
index 7e0efef4bb65a178d310cf3a107856b85ca5a354..1470cd3e519b80d746388cb0414b0fa59f596d43 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-omap/board-innovator.h
rename to arch/arm/plat-omap/include/mach/board-innovator.h
index 9ca03dec9d363bb812df43d2c63e83007d227c04..5ae3e79b9f9cc6610543c3873877c554985f12ec 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-omap/board-nokia.h
rename to arch/arm/plat-omap/include/mach/board-nokia.h
index 72deea203493b60675f46548a336d64196940ab6..2abbe001af8c43535a97624cd5a309d1cf4cc2fc 100644 (file)
@@ -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
  *
similarity index 97%
rename from include/asm-arm/arch-omap/board-osk.h
rename to arch/arm/plat-omap/include/mach/board-osk.h
index 94926090e475a715e4af75b77fbc2c35472100c2..3850cb1f220a340e2731e3074560c52a5a770293 100644 (file)
@@ -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.
  *
similarity index 94%
rename from include/asm-arm/arch-omap/board-palmte.h
rename to arch/arm/plat-omap/include/mach/board-palmte.h
index 6fac2c8935bec152e45bf23afa5f79371eb7e999..6906cdebbcfb20939b775f5a72096dd525e3f0e3 100644 (file)
@@ -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.
  *
similarity index 92%
rename from include/asm-arm/arch-omap/board-palmtt.h
rename to arch/arm/plat-omap/include/mach/board-palmtt.h
index d9590b0ec90eb941ccd56a3bbf8cee8cbf6bb854..e79f382b59315fef96afde02a8b084ec5bee2e56 100644 (file)
@@ -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.
  *
similarity index 93%
rename from include/asm-arm/arch-omap/board-palmz71.h
rename to arch/arm/plat-omap/include/mach/board-palmz71.h
index 1252a859787dc85ccdfcaca65f5f4c2017826584..b1d7d579b31315307d144a39b23a261a126894aa 100644 (file)
@@ -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.
  *
similarity index 95%
rename from include/asm-arm/arch-omap/board-perseus2.h
rename to arch/arm/plat-omap/include/mach/board-perseus2.h
index d7429cb0f72613b411bd2f2eda3c9ed8f3606a29..c06c3d717d57736aa796b2ec3e3c97d37e2fc168 100644 (file)
@@ -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
similarity index 95%
rename from include/asm-arm/arch-omap/board.h
rename to arch/arm/plat-omap/include/mach/board.h
index 99564c70f128e1c20f942c5152527a4d528218af..54445642f35d4ff4fd54e137fdcf845acdfb9238 100644 (file)
@@ -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;
similarity index 99%
rename from include/asm-arm/arch-omap/clock.h
rename to arch/arm/plat-omap/include/mach/clock.h
index 4c7b3514f71af8b0573513d36df8a2c67a75092d..92f7c7238fcd9b94d019287dc1ea7ddd07fca472 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-omap/common.h
rename to arch/arm/plat-omap/include/mach/common.h
index 8ac03071f60c66ca27ce726867cd61faf9011869..06093112b665c6b2b77330647f11938cfe898825 100644 (file)
@@ -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.
  *
similarity index 99%
rename from include/asm-arm/arch-omap/control.h
rename to arch/arm/plat-omap/include/mach/control.h
index 987553e3eeb9c038e0237cfbef7ea8979eb397f4..e3fd62d9a995115bc2514807a8203f52dfe31684 100644 (file)
@@ -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))
similarity index 99%
rename from include/asm-arm/arch-omap/cpu.h
rename to arch/arm/plat-omap/include/mach/cpu.h
index 52db09f832816d46bd1f990223fab3636d87c0d3..05aee0eda34fb9de569e630bc966e59c4f1a8928 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/cpu.h
+ * arch/arm/plat-omap/include/mach/cpu.h
  *
  * OMAP cpu type detection
  *
similarity index 96%
rename from include/asm-arm/arch-omap/debug-macro.S
rename to arch/arm/plat-omap/include/mach/debug-macro.S
index ca4f577f967588396bdd07146e74d41cda84682c..1b0039bdeb4ee28c0501e94d9c15afe9c060858e 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-omap/dma.h
rename to arch/arm/plat-omap/include/mach/dma.h
index f4dcb9587869acd9fb43190415e8ad54c64eba59..54fe9665b1826f674b761685d443f54c48567864 100644 (file)
@@ -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>
similarity index 98%
rename from include/asm-arm/arch-omap/dmtimer.h
rename to arch/arm/plat-omap/include/mach/dmtimer.h
index 02b29e8437ae01b941c0d86f3fce899946f07ded..6dc7031382104ea90eb5f901828c3c0e37035944 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/dmtimer.h
+ * arch/arm/plat-omap/include/mach/dmtimer.h
  *
  * OMAP Dual-Mode Timers
  *
similarity index 96%
rename from include/asm-arm/arch-omap/eac.h
rename to arch/arm/plat-omap/include/mach/eac.h
index ccee3b0700b3381a6609afcf23ac8692a91d3b95..9e62cf030270aa0130b59a0a55299f8dca122982 100644 (file)
@@ -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>
similarity index 92%
rename from include/asm-arm/arch-omap/entry-macro.S
rename to arch/arm/plat-omap/include/mach/entry-macro.S
index 67ed7839e782b55a3f013688c545b32560ae8a7a..d4e9043bf2013c23b08f34c9eefcba9322059c45 100644 (file)
@@ -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
similarity index 99%
rename from include/asm-arm/arch-omap/fpga.h
rename to arch/arm/plat-omap/include/mach/fpga.h
index f420881d2a3bd015e71d3b7361867f79d64e7b17..c92e4b42b2899cc0e6fdad376813815734cd5341 100644 (file)
@@ -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
  *
similarity index 98%
rename from include/asm-arm/arch-omap/gpio.h
rename to arch/arm/plat-omap/include/mach/gpio.h
index 5ee6a49864c33d317f17d2d485a9928371409f52..94ce2780e8ee88090b23b62351498cdcb7c323c6 100644 (file)
@@ -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
similarity index 94%
rename from include/asm-arm/arch-omap/gpioexpander.h
rename to arch/arm/plat-omap/include/mach/gpioexpander.h
index 4eed1f80e2fb57c6ae4cd7c84d2b9ddefede12be..90444a0d6b1ab72195c41a2f63bf5b9097ce6ed0 100644 (file)
@@ -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.
similarity index 99%
rename from include/asm-arm/arch-omap/hardware.h
rename to arch/arm/plat-omap/include/mach/hardware.h
index 45fdfccbd5d41edcb831b5e1f97cc4e03c6b7d18..07f5d7f21528874c11091d7ec982c87465a051d6 100644 (file)
@@ -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>
 
 /*
  * ---------------------------------------------------------------------------
similarity index 98%
rename from include/asm-arm/arch-omap/io.h
rename to arch/arm/plat-omap/include/mach/io.h
index 449e3568baa6c768ab6bc5cf9cb52c731625bc31..2a30b7d88cdeae71cff778ae13c90bbb65d950f7 100644 (file)
@@ -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
 
similarity index 95%
rename from include/asm-arm/arch-omap/irda.h
rename to arch/arm/plat-omap/include/mach/irda.h
index 96bb12fab4383582fbd11d5c979d0112fbd85180..8372a00d8e0badb3e4da7a631f03011655d11dc3 100644 (file)
@@ -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>
  *
similarity index 99%
rename from include/asm-arm/arch-omap/irqs.h
rename to arch/arm/plat-omap/include/mach/irqs.h
index afbf1e8464680484ee4647d8e7d382a6deabe78a..17248bbf3f27e5bbfe3dfc0d54bf260183f80bfa 100644 (file)
@@ -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>
 extern void omap_init_irq(void);
 #endif
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #endif
similarity index 95%
rename from include/asm-arm/arch-omap/keypad.h
rename to arch/arm/plat-omap/include/mach/keypad.h
index b7f83075436ec7e226e224d327fa678f4a8c4e41..232923aaf61d34ed0f66daf5af54d1fad7c73a13 100644 (file)
@@ -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>
  *
similarity index 92%
rename from include/asm-arm/arch-omap/led.h
rename to arch/arm/plat-omap/include/mach/led.h
index f3acae28e2dad8e533dbbf24d2178eaf072f3242..25e451e7e2fd9aeba2e133dfc94bfe4216a63494 100644 (file)
@@ -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>
similarity index 99%
rename from include/asm-arm/arch-omap/mcbsp.h
rename to arch/arm/plat-omap/include/mach/mcbsp.h
index 3da459a282b983f55530df5c10c8b9520de102d3..6eb44a92871db97961644ef2d147f30b5f1632cd 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-omap/memory.h
rename to arch/arm/plat-omap/include/mach/memory.h
index 14cba97c18ad061973876d1763aed27c7d8647ba..037486c5f4a432f9a4aaae887d02a1d483cc0ede 100644 (file)
@@ -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
similarity index 96%
rename from include/asm-arm/arch-omap/menelaus.h
rename to arch/arm/plat-omap/include/mach/menelaus.h
index 69ed7ee40179e4bf83ef0649c7072af6d93fae22..3122bf68c7ce85bf9add84dc8186fb8aed0f1e97 100644 (file)
@@ -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
  */
similarity index 98%
rename from include/asm-arm/arch-omap/mmc.h
rename to arch/arm/plat-omap/include/mach/mmc.h
index 7cfc5f2585606ef6a77b3d57a18aff153cb64096..fc15d13058fc74e5116490b4e704be355dd7b576 100644 (file)
@@ -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
 
similarity index 98%
rename from include/asm-arm/arch-omap/mtd-xip.h
rename to arch/arm/plat-omap/include/mach/mtd-xip.h
index f4714b5270d0d5d28ffd36e5ccc87232ee532267..5cee7e16a1b44398fc671fb46e9dbb18f8c37cdf 100644 (file)
@@ -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
 
similarity index 99%
rename from include/asm-arm/arch-omap/mux.h
rename to arch/arm/plat-omap/include/mach/mux.h
index ff9a5b5575fd4952ecbeef65362d7172195582c0..614b2c1327c747b77b5c693979babc566bd66d02 100644 (file)
@@ -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.
similarity index 93%
rename from include/asm-arm/arch-omap/nand.h
rename to arch/arm/plat-omap/include/mach/nand.h
index 17ae26e353534beff5e20b626fa9c992e703d7ad..631a7bed1eefb8ac6fef57b02c5f60a850fb1c64 100644 (file)
@@ -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.
  *
similarity index 97%
rename from include/asm-arm/arch-omap/omap-alsa.h
rename to arch/arm/plat-omap/include/mach/omap-alsa.h
index faa0ed23d4bad8fefedb69627aae17f085ea16e3..bdf30a0f87f2f2c81a0477bfff20a38a714b78c8 100644 (file)
@@ -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.
  *
 #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)
similarity index 97%
rename from include/asm-arm/arch-omap/omap1510.h
rename to arch/arm/plat-omap/include/mach/omap1510.h
index c575d354850f459f1d8290f7074ba3dc2cb119f0..505a38af8b22a36376c65e2374cf7b13d8f42361 100644 (file)
@@ -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.
  *
similarity index 99%
rename from include/asm-arm/arch-omap/omap16xx.h
rename to arch/arm/plat-omap/include/mach/omap16xx.h
index f7f5cdfdccce4f40a4a6a2c9e54240f76864ae49..c6c93afb2788f4b00911a67ec6d538570ec4a7ca 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-omap/omap24xx.h
rename to arch/arm/plat-omap/include/mach/omap24xx.h
index b9fcaae287c8a1e3865fd72bd6527d1090e56809..bb8319d66e9f5afa64a2798ccaca93ee98e76d57 100644 (file)
@@ -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.
similarity index 98%
rename from include/asm-arm/arch-omap/omap34xx.h
rename to arch/arm/plat-omap/include/mach/omap34xx.h
index aa30c6d10abd49aa3f7ae1b9a664e915264469b3..8e0479fff05a286090a092ccd80601a2fa5ede8a 100644 (file)
@@ -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.
  *
similarity index 98%
rename from include/asm-arm/arch-omap/omap730.h
rename to arch/arm/plat-omap/include/mach/omap730.h
index 755b64c5e9f07342fdacf476c407226dbe66eab8..14272bc1a6fd88b87774b197e47beb4cbaa10fde 100644 (file)
@@ -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.
  *
similarity index 99%
rename from include/asm-arm/arch-omap/omapfb.h
rename to arch/arm/plat-omap/include/mach/omapfb.h
index 46d7a4f6085495ec4d86274b61d8a90146cc92fc..cae037d130792a7c466a697d079b475c2f756e8b 100644 (file)
@@ -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
similarity index 91%
rename from include/asm-arm/arch-omap/onenand.h
rename to arch/arm/plat-omap/include/mach/onenand.h
index 6c959d0ce470931d7fbffd3877e869030c9db35a..d57f20226b28733743c35455bb798836ba34f299 100644 (file)
@@ -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
similarity index 66%
rename from include/asm-arm/arch-omap/param.h
rename to arch/arm/plat-omap/include/mach/param.h
index face9ad41e97a7425819b467203a2510d0413009..1eb4dc3269795cc536fe54fdf7283222a61ce926 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/param.h
+ *  arch/arm/plat-omap/include/mach/param.h
  *
  */
 
similarity index 99%
rename from include/asm-arm/arch-omap/pm.h
rename to arch/arm/plat-omap/include/mach/pm.h
index 14588059981f99cf8f8f299d5f79292c1b8e9fb0..bfa09325a5ffad992a7c2aadd05b84d899ccf36d 100644 (file)
@@ -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
  *
similarity index 95%
rename from include/asm-arm/arch-omap/prcm.h
rename to arch/arm/plat-omap/include/mach/prcm.h
index 7bcaf94bde9f52ea8327983622a6cb684f5f4999..56eba0fd6f6a3db715397622a14009736158afd7 100644 (file)
@@ -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
  *
similarity index 99%
rename from include/asm-arm/arch-omap/sdrc.h
rename to arch/arm/plat-omap/include/mach/sdrc.h
index 673b3965befc0485995fab2b620a7332d4429a00..787b7acec546eeaf7330be8e8e834b83e5b22d61 100644 (file)
@@ -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() */
 
similarity index 95%
rename from include/asm-arm/arch-omap/serial.h
rename to arch/arm/plat-omap/include/mach/serial.h
index 79a5297af9fca0457ad1418eee617b073fcbeb50..cc6bfa51ccb54022498cd8f02f1d68aa433467f0 100644 (file)
@@ -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
similarity index 97%
rename from include/asm-arm/arch-omap/sram.h
rename to arch/arm/plat-omap/include/mach/sram.h
index be59f4a9828be420f0e5512bbcb640b4ca1356df..e09323449981aa230f4b1a6e309d2117878cd548 100644 (file)
@@ -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
  *
similarity index 90%
rename from include/asm-arm/arch-omap/system.h
rename to arch/arm/plat-omap/include/mach/system.h
index 176d9d6c258e0497163d21bf5636bc7ddfd86125..06a28c7b98de7020054497fbfcb4714dec9ac321 100644 (file)
@@ -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)
similarity index 98%
rename from include/asm-arm/arch-omap/tc.h
rename to arch/arm/plat-omap/include/mach/tc.h
index 65a9c82d3bf75d7e0296da38f9369b869af3e704..d2fcd789bb9a5ef848a1fe9fa9df9c4156547062 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/tc.h
+ * arch/arm/plat-omap/include/mach/tc.h
  *
  * OMAP Traffic Controller
  *
similarity index 97%
rename from include/asm-arm/arch-omap/timex.h
rename to arch/arm/plat-omap/include/mach/timex.h
index 21f2e367185a74bb4d3663f5c7c190bf8d705557..6d35767bc48f0f1ebb1e682ab46ead9f9d697e5c 100644 (file)
@@ -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>
similarity index 92%
rename from include/asm-arm/arch-omap/uncompress.h
rename to arch/arm/plat-omap/include/mach/uncompress.h
index aca0adfef1b8da878ca3a499fbfea14e0e98a2f0..0814c5f210c33a6ba41b2a38f8a2392c2b813cce 100644 (file)
@@ -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;
 
similarity index 99%
rename from include/asm-arm/arch-omap/usb.h
rename to arch/arm/plat-omap/include/mach/usb.h
index ddf1861e6df9d89236d9ad0632f160f0037e1680..a56a610950c239e38e35b7f7d963084237f12fb4 100644 (file)
@@ -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>
 
 /*-------------------------------------------------------------------------*/
 
similarity index 94%
rename from include/asm-arm/arch-omap/vmalloc.h
rename to arch/arm/plat-omap/include/mach/vmalloc.h
index 5b8bd8dae8be7848c491d8aafbc759800a3767da..dc104cd96197ce63e983cbd4139830bbe36ce29b 100644 (file)
@@ -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.
  *
index ff1413eae0b84b73803c67754366e4ea09ea814f..1d7aec1a691a67b27d7b0f9a0875ada1da7c632f 100644 (file)
@@ -31,7 +31,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <asm/io.h>
-#include <asm/arch/mailbox.h>
+#include <mach/mailbox.h>
 #include "mailbox.h"
 
 static struct omap_mbox *mboxes;
index c7f74064696c5cd2cea2ef153e124c0329794bac..d0844050f2d2da0febf9e95e287f032ed95f3ef7 100644 (file)
@@ -24,8 +24,8 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/dma.h>
+#include <mach/mcbsp.h>
 
 static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];
 
index 6f3f459731c8feb650f2cb37bb9742671cfc3b4d..847df208c46ca78db749fd0aad8605ab53a9aa5d 100644 (file)
@@ -28,7 +28,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/spinlock.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 #ifdef CONFIG_OMAP_MUX
 
index 005261a4e72088476996e42cbca2a030c7d537e5..8bdbf979a2573fd17d587bed84435f1d79d61ff3 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define OCPI_BASE              0xfffec320
 #define OCPI_FAULT             (OCPI_BASE + 0x00)
index 554ee58e12948d2a2b5592c598b3096ceae69b1a..ac67eeb6ca6a6266428ad8c74a906af7df4469b9 100644 (file)
 
 #include <asm/mach/map.h>
 
-#include <asm/arch/sram.h>
-#include <asm/arch/board.h>
+#include <mach/sram.h>
+#include <mach/board.h>
 
-#include <asm/arch/control.h>
+#include <mach/control.h>
 
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 # include "../mach-omap2/prm.h"
index 359912ffed7f4a1f766bb5e86556dbbae7170439..777485e0636becdd9975f7c6045abce0eefe9492 100644 (file)
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/control.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/board.h>
+#include <mach/control.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+#include <mach/board.h>
 
 #ifdef CONFIG_ARCH_OMAP1
 
index 93c4ef9f00673358a0b8169b25fafd4b356b0df6..544d6b327f3a1e3f383a343ba6571316b67b3886 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <asm/mach/time.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * Number of timer ticks per jiffy.
index 373d0435848550acec5ff94001a5b5a9902eb35a..54d4b8e2263cb9ab3e35dc0c5b696f2ae925d97f 100644 (file)
 #include <linux/mutex.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
index a608aa388820574cf6f0e8f2ea2f7b1269940836..1863a1b1bc4995b05e7a0b46e2b7d3cdcedc0f47 100644 (file)
 #include <asm/mach/irq.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
 
 #include <asm/plat-s3c/nand.h>
 
index 05a1d9cc280c9f07153a586dbabce4261eb367c4..6d60f0476bb850e949056924d829920e8b797f5b 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/delay.h>
@@ -39,9 +39,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/system-reset.h>
+#include <mach/system-reset.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-serial.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
index 5c6f446a1fa929d527572a4649a51ec9222e55a8..d6fb76578b112f392a5e840857b56cefb6633bd2 100644 (file)
@@ -23,8 +23,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/fb.h>
-#include <asm/arch/hardware.h>
+#include <mach/fb.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index 8ae5719d6b3be88f03cc25054255fcae0fdd3658..08c2aaf14c41d56e0438cefd6e493cefbafe3d7f 100644 (file)
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
 #include <asm/mach/dma.h>
-#include <asm/arch/map.h>
+#include <mach/map.h>
 
 #include <asm/plat-s3c24xx/dma.h>
 
index ace8bec5de5ae4194db4c9ace3f056872aa66212..dd27334e3d7e384ed7afcac9ad5c9592b074d308 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)
 {
index 6dd5211c9c6755c90cf050f0c8d09076a09e8cae..849f8469714a67e773efa7aabd38af9dde95f1f5 100644 (file)
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 struct s3c24xx_gpio_chip {
        struct gpio_chip        chip;
index f524d765c8aa1330d0389ecdbe2f903d142fe2d5..36cefe17683566e8a657a923f6261146aab5e473 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index 9919419e32733290a6e8a6374435eab67ae4f3e4..e6705014b2a0efd5a77e23b9c3da2c85c389af89 100644 (file)
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/map.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
 
 #include <asm/mach-types.h>
 
index 0d044bcbe1ac28598c6bc6571d5630095ce8efcd..fc4b731a949cdd05907a8556384d7390ca9327c1 100644 (file)
 #include <linux/serial_core.h>
 
 #include <asm/cacheflush.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-mem.h>
+#include <mach/regs-irq.h>
 
 #include <asm/mach/time.h>
 
index 489e32abf3ac8af3eddb06a698b5c065e40c6a9a..ccfdc9d7ae4ba59442f76d13720abee79f34df1c 100644 (file)
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
index a811e8b6d4558c62b8b754d183beff379a6455d5..8a5fffde663194d9b2dc7c387ed2527f92fcb582 100644 (file)
 #include <linux/mutex.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
index 2eefe16bd2a85364a86176299c6b31c4ac5e8d4c..f3dc38cf1de4a66ea8f53dc8951481e321338153 100644 (file)
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
index eb9dd4f9b8ecebf20a00702c8e7374e5503ede04..281b4804ed3865564a07e9ee3256f8649670bd98 100644 (file)
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-gpioj.h>
+#include <mach/regs-dsc.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
index 4f8756e19bb116594fb3781f84a220b05f2c81dd..4981a08b6ebbcb9fa6eb5e604b2f453b1ec18699 100644 (file)
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/map.h>
+#include <mach/hardware.h>
+#include <mach/map.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-mem.h>
 #include <asm/plat-s3c/regs-serial.h>
 
 /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not
index 766473b3f98b6bf2d8b4ae61af4254949d9431fb..b471a21ae2e4ee3e5f23341d7d0bd9420a881b69 100644 (file)
@@ -32,9 +32,9 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/map.h>
+#include <mach/map.h>
 #include <asm/plat-s3c/regs-timer.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-irq.h>
 #include <asm/mach/time.h>
 
 #include <asm/plat-s3c24xx/clock.h>
index be85c6d1edfed34a8ee94e52a55514f2dec5fcf2..74e9cd81b5b253b8139d9fbc6ceea59afeb77c27 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/uaccess.h>
 #include <asm/therm.h>
index b4402b5958e8d15c5fbfdd467ec84422779c64d8..263567f5f3923fb12ae13d6401aa84f1b636aa07 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/hw_random.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 
 static int ixp4xx_rng_data_read(struct hwrng *rng, u32 *buffer)
index 42a107fe92336132bca11786e202627867cfaff0..2d637e0fbc038df28dbfbff2d342b89edf6db4a4 100644 (file)
@@ -27,8 +27,8 @@
 #include <crypto/authenc.h>
 #include <crypto/scatterwalk.h>
 
-#include <asm/arch/npe.h>
-#include <asm/arch/qmgr.h>
+#include <mach/npe.h>
+#include <mach/qmgr.h>
 
 #define MAX_KEYLEN 32
 
index 85bfeba4d85eab01eb9e2c7b339eeccd674e2b0b..71fba82462cb98372568a2f2da6c8c325e1a10d8 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/memory.h>
 #include <linux/ioport.h>
 
-#include <asm/arch/adma.h>
+#include <mach/adma.h>
 
 #define to_iop_adma_chan(chan) container_of(chan, struct iop_adma_chan, common)
 #define to_iop_adma_device(dev) \
index 5ec60d141ce144c3adb6fc6bf150a3edfe1e0c5e..75089febbc13e10bc227183ee0a62755932d86b2 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/hardware/ioc.h>
 #include <asm/system.h>
index 73d61946a53438bbc369cf7bdb51f445100037ac..c1adcdbf7979d5f958d9780a719c03c961171f84 100644 (file)
@@ -27,9 +27,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/at91_twi.h>
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
+#include <mach/at91_twi.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
 
 #define TWI_CLOCK              100000          /* Hz. max 400 Kbits/sec */
 
index eccbb74515622e455fd1ef9859ce2ef0caf1fec4..5d7789834b9540b6bb4014128097532fa5b383cf 100644 (file)
@@ -36,9 +36,9 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/i2c.h>
+#include <mach/i2c.h>
 
 /* ----- global defines ----------------------------------------------- */
 
index bd0f3f4323bcb1836f5415a77dcdc440406cdb0f..05d72e981353003e514010a680accc4e692d2cfd 100644 (file)
@@ -33,8 +33,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/arch/hardware.h> /* Pick up IXP2000-specific bits */
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>     /* Pick up IXP2000-specific bits */
+#include <mach/gpio.h>
 
 static inline int ixp2000_scl_pin(void *data)
 {
index e06ccc6c5e97158b06ee346efac72b9963d0ae60..ec15cff556b9a9b4d3e8bd12d9d221215bfd0892 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/completion.h>
 #include <linux/platform_device.h>
 #include <linux/i2c-pnx.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
index d65b7fbb46942b058b83dd7d1c478241019da4c4..44d838410f15830e45f749eef5d41fcde17a15ff 100644 (file)
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/i2c.h>
+#include <mach/pxa-regs.h>
 
 struct pxa_i2c {
        spinlock_t              lock;
index b216bfbea78c1b789a2561e52ff20598d72a1801..c772e02c28036a9621006e78f66cebee27fd1e41 100644 (file)
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-iic.h>
 #include <asm/plat-s3c/iic.h>
 
index 03a33f1b9cd36de1c7eb1404e6fe196590d0819f..18355ae2155d9bf83d9276ac5204dfecf01a40b1 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/workqueue.h>
 
 #include <asm/irq.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
 
 
 #ifndef        DEBUG
@@ -94,7 +94,7 @@ struct isp1301 {
 /* board-specific PM hooks */
 
 #include <asm/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 #include <asm/mach-types.h>
 
 
index e3c12e365c4920bee8653b15e2950cc73aae1231..176126d3a01d3054318347cff48dfce8dc2805a1 100644 (file)
@@ -43,8 +43,8 @@
 
 #include <asm/mach/irq.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
+#include <mach/gpio.h>
+#include <mach/menelaus.h>
 
 #define DRIVER_NAME                    "menelaus"
 
index 8a3bb23f8ae7a17313ca44f48c9ced52828b494b..f728f2927b5a03a9ed4d1c8086ba67c9da350810 100644 (file)
@@ -16,7 +16,7 @@
 #define DRV_NAME "ide_arm"
 
 #ifdef CONFIG_ARCH_CLPS7500
-# include <asm/arch/hardware.h>
+# include <mach/hardware.h>
 #
 # define IDE_ARM_IO    (ISASLOT_IO + 0x1f0)
 # define IDE_ARM_IRQ   IRQ_ISA_14
index 8a77bfcd05bc35f9e58a53242788652d95b2c38e..18222a689a03a575fa7a85495a0d26006c112b90 100644 (file)
@@ -20,8 +20,8 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/aaed2000.h>
+#include <mach/hardware.h>
+#include <mach/aaed2000.h>
 
 #define KB_ROWS                        12
 #define KB_COLS                        8
index 1aa46ae1263025bacdc9627faae989066d025969..134e67bf6a90b80e4442ddcd3c8b6c22a138b061 100644 (file)
 #include <linux/module.h>
 #include <linux/slab.h>
 
-#include <asm/arch/corgi.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/corgi.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
 #include <asm/hardware/scoop.h>
 
 #define KB_ROWS                                8
index 63774b53d75cc62080e4d8a7f4aaa0d52e9ce762..4e016d823069a65cce32c3fbd5cd94667e2de93c 100644 (file)
@@ -24,8 +24,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/jornada720.h>
-#include <asm/arch/hardware.h>
+#include <mach/jornada720.h>
+#include <mach/hardware.h>
 
 MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");
index b79648508324895a53f4fb825600af943e10fb54..dcea87a0bc5674e16b88502273b903d684800663 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/errno.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/menelaus.h>
+#include <mach/gpio.h>
+#include <mach/keypad.h>
+#include <mach/menelaus.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 #undef NEW_BOARD_LEARNING_MODE
 
index 8a925359d82e0e14ff93e37ea2cb753eacdaf822..6d30c6d334c38eca442b3e2902e338a8230d3733 100644 (file)
@@ -29,8 +29,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa27x_keypad.h>
+#include <mach/hardware.h>
+#include <mach/pxa27x_keypad.h>
 
 /*
  * Keypad Controller registers
index 1aa37181c40fad52d1b15eee896f2a63f4dcb221..de67b8e0a799bfe4e2e2cb83c2008825d72ffe14 100644 (file)
 #include <linux/module.h>
 #include <linux/slab.h>
 
-#include <asm/arch/spitz.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/spitz.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
 
 #define KB_ROWS                        7
 #define KB_COLS                        11
index b12b7ee4b6aa304e9096e9b50afbaeca1beae24b..44cb50af3ce973616517d3aca4147ecdf16d4361 100644 (file)
@@ -19,8 +19,8 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/tosa.h>
+#include <mach/gpio.h>
+#include <mach/tosa.h>
 
 #define KB_ROWMASK(r)          (1 << (r))
 #define SCANCODE(r, c)         (((r)<<4) + (c) + 1)
index 7908f5c12b084279ff5af9b942b30bc08848ed01..9946d73624b9188bc88bf3400a2f026b3828489b 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("ixp4xx beeper driver");
index 536e3be31b407421d7abc315a533a808a44837c1..56c079ef50182cb5593f6b6f36c280e1f3312c64 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>
index 22374d0d998f49e1e305f53e81f232e5b8c332d5..7f36edd34f8bcad063a595e23707ca894c9d7029 100644 (file)
@@ -35,7 +35,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>
 #include <asm/system.h>
index d0e13fc4a88c0391976859d7561a69f381c17eac..65202c9f63ffbe4f7838654d59514ea34048ed7d 100644 (file)
 #include <linux/slab.h>
 #include <linux/irq.h>
 
-#include <asm/arch/sharpsl.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
+#include <mach/sharpsl.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
 
 
 #define PWR_MODE_ACTIVE                0
index 4f86081dc7fcb142602d86909628908422066b18..4d3139e2099d02b6f7bed9432b723fc4b84490e2 100644 (file)
@@ -39,8 +39,8 @@
 #include <linux/delay.h>
 
 /* SA1100 serial defines */
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
 
 #define DRIVER_DESC    "H3600 touchscreen driver"
 
index 19f40772c2fd8cc1dde479105f8bc128360ea791..bf44f9d68342bdcd41f4b63ed87737d60e8f70cf 100644 (file)
@@ -19,8 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/jornada720.h>
+#include <mach/hardware.h>
+#include <mach/jornada720.h>
 
 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");
index 590a1379aa321b3b0c59d80504818e897314f7fb..283f93a0cee29f873baa7f544b46363184f3529b 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/wm97xx.h>
 #include <linux/io.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 #define VERSION                "0.13"
 
index c37bb0d5a0c5719eccf82dcfe110e1eb14bcbeeb..32c98b2efa3fe4d120d497389703d6795ae470b3 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <asm/arch/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 /*
  * Our context
index accc7eddb788658ae15579f374af14d7542619b5..836a43d776e61db134f2ec0c37d5323650cbd4a1 100644 (file)
@@ -18,8 +18,8 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 
 #define GPIO_RED_LED                   (93)
 #define GPIO_GREEN_LED                 (94)
index e9d419ff784e30feeb9bfee54d6b42dbc931f16f..bc2dcd89f63545478fb28093ed3ae739cc931b03 100644 (file)
@@ -15,9 +15,9 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/corgi.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 #include <asm/hardware/scoop.h>
 
 static void corgiled_amber_set(struct led_classdev *led_cdev,
index a7421b8c47d8c41cec798ce43cef4bfc6d8fbaed..be0e12144b8b6d5cc03ca24c38caa3d98309e0ed 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 static short __iomem *latch_address;
index 5227585e74bff17d9878ca05f72bdb12be3ff2ad..11b77a70bbcb5e3d563e20f25f2493075de626c3 100644 (file)
@@ -16,9 +16,9 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/leds.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/h1940-latch.h>
+#include <mach/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/h1940-latch.h>
 
 /*
  * Green led.
index 17ebfe283e760486964de2303168daa0f9a69bf4..5d91362e30669125178fe8e62a9a8b9d3ddd0feb 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/locomo.h>
 
 static void locomoled_brightness_set(struct led_classdev *led_cdev,
index cb74c1890b3615d1013f3017291af4e0e944c67a..25a07f2643ade687245f5f3e929207325e094da0 100644 (file)
@@ -16,9 +16,9 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
+#include <mach/hardware.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
 
 /* our context */
 
index e75e8543bc5ae187198ad6f08d495541f2890098..178831c64bfb2dbed496df7886f151235bb80a01 100644 (file)
@@ -17,9 +17,9 @@
 #include <linux/leds.h>
 #include <asm/hardware/scoop.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/spitz.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/spitz.h>
 
 static void spitzled_amber_set(struct led_classdev *led_cdev,
                               enum led_brightness value)
index b15f82c497662550e4404611e9f1b0aa9e3811cc..5e7ebca1968e9263c12736b35fce89a2e2e27ddf 100644 (file)
@@ -36,8 +36,8 @@
 #include <linux/videodev2.h>
 
 #include <asm/dma.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/camera.h>
+#include <mach/pxa-regs.h>
+#include <mach/camera.h>
 
 #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
 #define PXA_CAM_DRV_NAME "pxa27x-camera"
index 6a2a2a8c3878efccd64c6928c1cb4a05b7d7c15a..28380b20bc70475677943e11ba1cc79c871f1255 100644 (file)
 #include <linux/platform_device.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
-#include <asm/arch/mcp.h>
+#include <mach/mcp.h>
 
-#include <asm/arch/assabet.h>
+#include <mach/assabet.h>
 
 #include "mcp.h"
 
index a67541113e1d48641515a8f5b571c685ab163b5b..a316f1b759332ff763e76b4a04f9d897daed3130 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/mutex.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "ucb1x00.h"
 
index ad34e2d22524f5a7d96d4acd609c2b1c59dd454e..44762ca86a8d45bbe41e640d7a4d22c2e098ac83 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/kthread.h>
 
 #include <asm/dma.h>
-#include <asm/arch/collie.h>
+#include <mach/collie.h>
 #include <asm/mach-types.h>
 
 #include "ucb1x00.h"
index f15e2064305cd227ab93f7fdaaa8006ceb684e36..6915f40ac8ab4c293775563ed932a95d326bbbdb 100644 (file)
@@ -73,9 +73,9 @@
 #include <asm/gpio.h>
 
 #include <asm/mach/mmc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91_mci.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
+#include <mach/at91_mci.h>
 
 #define DRIVER_NAME "at91_mci"
 
index f61406da65d2c953e31896395209ce76428990cc..2f0fcdb869b76995904c361af677b686bc986ca3 100644 (file)
@@ -42,8 +42,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/imx-dma.h>
+#include <mach/mmc.h>
+#include <mach/imx-dma.h>
 
 #include "imxmmc.h"
 
index 1f587a239b02abfc0413b2a46b7fe8b77f4bdebd..c16028872bbbc0b19c23c8cdb895ad91a22fa3a4 100644 (file)
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
+#include <mach/board.h>
+#include <mach/mmc.h>
+#include <mach/gpio.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
+#include <mach/fpga.h>
 
 #define        OMAP_MMC_REG_CMD        0x00
 #define        OMAP_MMC_REG_ARGL       0x04
index a8e18fe53077fee9023442745332706a9929888f..55093ad132ca62037a5dc0b4b1765353a70f0882 100644 (file)
@@ -31,8 +31,8 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mmc.h>
+#include <mach/pxa-regs.h>
+#include <mach/mmc.h>
 
 #include "pxamci.h"
 
index be550c26da68d1cc82d2f25ac6880e84c6dae5b3..7c994e1ae2769a4adf3c9c50c1f84544292e0584 100644 (file)
@@ -18,8 +18,8 @@
 
 #include <asm/dma.h>
 
-#include <asm/arch/regs-sdi.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-sdi.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/mci.h>
 
index f199b16de2db87702fe50e86eebe50f0b9b3ea33..53664188fc471c1ecd03952abc7b044129ea16cb 100644 (file)
@@ -25,8 +25,8 @@
 #include <linux/init.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/autcpu12.h>
+#include <mach/hardware.h>
+#include <mach/autcpu12.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
index cb507da0a87d74e62dea447b08a2ee64cc1faade..e5059aa3c724b189613db3ab6a61255a91d2f3be 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
index 468204ca238f7a4337419619b3a3d29c7f6b7ce1..60e68bde0fea55358ae79377e26a1f7740cc5fbf 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/concat.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
index 873ff1523bbef3dd20053afaf4050e6c4ee2deaa..35fef655ccc4c8e5cbfe55eae84f6aead0456b32 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 static struct mtd_info *mymtd;
index d0282ceecc9f8a874aa7e4cfe335dc3d49a19af1..7100ee3c7b01fa0e8caf00a969c2c78449a2d3d5 100644 (file)
@@ -37,7 +37,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/mach/flash.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
index 6447e8be992202832f5d14b49a6e1e023611f9b1..ed58f6a77bd92771d118223f6a31825a831bb7b3 100644 (file)
@@ -24,8 +24,8 @@
 #include <linux/mtd/concat.h>
 #endif
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/h3600.h>
+#include <mach/hardware.h>
+#include <mach/h3600.h>
 #include <asm/io.h>
 
 
index 33b583e0d1bf352fc0568859f49593d459fce824..dcdb1f17577db3ba909219ef7160744abb8040b8 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/flash.h>
 
 #include <linux/reboot.h>
index 771e6806c58df364dbbd01f1fcf0947c59756ad4..05f276af15da39043f0c5f7ee893e70a7f9df826 100644 (file)
@@ -43,9 +43,9 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/tc.h>
+#include <mach/tc.h>
 
 #ifdef CONFIG_MTD_PARTITIONS
 static const char *part_probes[] = { /* "RedBoot", */ "cmdlinepart", NULL };
index fe070cc0a49f29c42417a81ff0c1b6380715cd3c..771139c5bf87b0a644e6d86b67a2858659715b54 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/cacheflush.h>
 
 #include <asm/mach/flash.h>
index 7fc3204eee7e994c85fb4d6d52a237bd9a7119fa..7df6bbf0e4d9337e8ea01da8f93b1821577ca8c3 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/concat.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <asm/mach/flash.h>
index a0ba07c36ee982bf33a963ccf14d1b94b30ea21d..26d42987971fc9480520454fd2944e23c5f47641 100644 (file)
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/sizes.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board-ams-delta.h>
+#include <mach/gpio.h>
+#include <mach/board-ams-delta.h>
 
 /*
  * MTD structure for E3 (Delta)
index 99aec46e21450565e3e323adccfcb1f077597511..3387e0d5076b06bad1af8506d73f673db99a1d2a 100644 (file)
@@ -32,8 +32,8 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
 
 #ifdef CONFIG_MTD_NAND_ATMEL_ECC_HW
 #define hard_ecc       1
index 553dd7e9b41c983711898a3a0020d4647731efc5..7c95da1f612cd0ff4bc9961af433425d5a680998 100644 (file)
@@ -32,9 +32,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/sizes.h>
-#include <asm/arch/autcpu12.h>
+#include <mach/autcpu12.h>
 
 /*
  * MTD structure for AUTCPU12 board
index fc8529bedfdf2076b6cc17b402d660d2d0d7d856..9eba3f04783a90962071f6ad5676c151c031301a 100644 (file)
@@ -26,8 +26,8 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 
 #define GPIO_NAND_CS   (11)
 #define GPIO_NAND_RB   (89)
index 387e4352903e80af7807c155129ab131e9dfbacf..86366bfba9f8866d17f87585379ef84e5b749734 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <mach/hardware.h>     /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
 #include <asm/hardware/clps7111.h>
 
index 9e59de501c2e95beab5a18881b38ed2c312794a0..f8ce79b446ed8278a20bab97ec1160eca2f2b52d 100644 (file)
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <mach/hardware.h>     /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
-#include <asm/arch/h1900-gpio.h>
-#include <asm/arch/ipaq.h>
+#include <mach/h1900-gpio.h>
+#include <mach/ipaq.h>
 
 /*
  * MTD structure for EDB7312 board
index ee2ac3948cd80b889332f004e5532cfaec4263ea..64002488c6eeff76b977c7a128fb2000233ecd2c 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/plat-orion/orion_nand.h>
 
 #ifdef CONFIG_MTD_CMDLINE_PARTS
index fe2bc7e421191a061020d6f0dda7731d1c2bd819..a64ad15b8fdd10affbde4c41c07c3c7a324af00b 100644 (file)
@@ -22,8 +22,8 @@
 #include <linux/irq.h>
 #include <asm/dma.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa3xx_nand.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa3xx_nand.h>
 
 #define        CHIP_DELAY_TIMEOUT      (2 * HZ/10)
 
index 18d2cd395b24f14508746263fc674ff5abb78a6b..30a518e211bdf9a1e6016b32799974ab453e0fd3 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 static void __iomem *sharpsl_io_base;
index 807a72752eeb035885b1f633d77d7f4e08e4ee6e..2c410a011317a8ba3c9ec6a178835c4ad24fe39d 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/sizes.h>
 #include <asm/mach-types.h>
 
index 0ece4f9f1fa101db37ae161791601c71702b1523..aa4a5246be534a483e6ec42a6b67ba8986e371cd 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
index ffae266e2d7fd66eac66d5a27200fcb411773ea2..0fa53464efb29c8cca393d004e8aaf861f08d93b 100644 (file)
@@ -32,9 +32,9 @@
 #include <asm/uaccess.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/at91rm9200_emac.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/at91rm9200_emac.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
 
 #include "at91_ether.h"
 
index 18d3eeb7eab26188501967dcf4fc9b95d773210c..1267444d79da80d0e1fb18e12d204db06bae6efc 100644 (file)
@@ -20,8 +20,8 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <asm/arch/ep93xx-regs.h>
-#include <asm/arch/platform.h>
+#include <mach/ep93xx-regs.h>
+#include <mach/platform.h>
 #include <asm/io.h>
 
 #define DRV_MODULE_NAME                "ep93xx-eth"
index 9b777d9433cd8b87b7c8479ef52c0d893f1ee117..020771bfb6039839becfdda79f4d1d085a2912f3 100644 (file)
@@ -32,8 +32,8 @@
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/platform_device.h>
-#include <asm/arch/npe.h>
-#include <asm/arch/qmgr.h>
+#include <mach/npe.h>
+#include <mach/qmgr.h>
 
 #define DEBUG_QUEUES           0
 #define DEBUG_DESC             0
index fba87abe78ee21f96b87fac12156fc1e35dead64..ea6144a9565e571665db792b7686a31ff991c823 100644 (file)
@@ -189,7 +189,7 @@ static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
 #elif defined(CONFIG_ARCH_PNX010X)
 #include <asm/irq.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #define CIRRUS_DEFAULT_BASE    IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)      /* = Physical address 0x48200000 */
 #define CIRRUS_DEFAULT_IRQ     VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
 static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
index 2f89d47a37c5453c430c017687cbd7916fb10d71..f83c5b881d2d2c5210af46a7de2b5ec729f5b5c0 100644 (file)
@@ -14,7 +14,7 @@
 #include <net/irda/irda_device.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "sir-dev.h"
 
index f76b0b6c277d034be801e01925203df739c6e140..4aa61a1a3d55f7cccc10003bc3a1bbc2f463a790 100644 (file)
@@ -23,8 +23,8 @@
 #include <net/irda/irda_device.h>
 
 #include <asm/dma.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/irda.h>
+#include <mach/pxa-regs.h>
 
 #define IrSR_RXPL_NEG_IS_ZERO (1<<4)
 #define IrSR_RXPL_POS_IS_ZERO 0x0
index d16594a5dbc75f31f2f92fffc989b3a26906f57d..a95188948de7b80a385ddeab5fe7b437e898aa33 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/irda.h>
 
 static int power_level = 3;
index 65267c9731094e5f57a954f30f08cb61c47d5389..f5ffd7e05d268ad509b5204b5515c02ae0b8c4fc 100644 (file)
@@ -13,8 +13,8 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/ixp2000-regs.h>
+#include <mach/hardware.h>
+#include <mach/ixp2000-regs.h>
 #include <asm/delay.h>
 #include <asm/io.h>
 #include "ixp2400-msf.h"
index daba82bbcb5672fad842e135202abae4bed5c878..84c77f1f9a5cf755a33de626c140cd9c8f73e269 100644 (file)
@@ -21,8 +21,8 @@
 #include <linux/platform_device.h>
 #include <linux/phy.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
 
 #include "macb.h"
 
index f2655ce526b9459fb93ff3480c76f7ccbaf687ac..3f9af759cb90a1e47cbcd94f4a313ec824daaab6 100644 (file)
 #include <linux/mii.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/pfifo.h>
-#include <asm/arch/xc.h>
-#include <asm/arch/eth.h>
+#include <mach/hardware.h>
+#include <mach/netx-regs.h>
+#include <mach/pfifo.h>
+#include <mach/xc.h>
+#include <mach/eth.h>
 
 /* XC Fifo Offsets */
 #define EMPTY_PTR_FIFO(xcno)    (0 + ((xcno) << 3))    /* Index of the empty pointer FIFO */
index 76c17c28fab4b271006f51163f6029784149c311..2abfc284519829ee05856b26b80c0ce45f2e27b5 100644 (file)
@@ -222,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,
  */
 #include <linux/dma-mapping.h>
 #include <asm/dma.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 static dma_addr_t rx_dmabuf, tx_dmabuf;
 static int rx_dmalen, tx_dmalen;
index 22209b6f14057e0fadadebe9d441e5b33172d334..997e7f1d5c6e496b42bd602baf473f16acfd45e2 100644 (file)
@@ -187,7 +187,7 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 
 #elif defined(CONFIG_SA1100_ASSABET)
 
-#include <asm/arch/neponset.h>
+#include <mach/neponset.h>
 
 /* We can only do 8-bit reads and writes in the static memory space. */
 #define SMC_CAN_USE_8BIT       1
@@ -339,7 +339,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
  * IOBARRIER on entry to their ISR.
  */
 
-#include <asm/arch/constants.h>        /* IOBARRIER_VIRT */
+#include <mach/constants.h>    /* IOBARRIER_VIRT */
 
 #define SMC_CAN_USE_8BIT       0
 #define SMC_CAN_USE_16BIT      1
@@ -525,7 +525,7 @@ struct smc_local {
  */
 #include <linux/dma-mapping.h>
 #include <asm/dma.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 #ifdef SMC_insl
 #undef SMC_insl
index ab6b4bee31875949bce845b815a9525e58f37069..a0ffb8ebfe00765cdf6fcf84e94f5dd5662844ee 100644 (file)
 
 #include <pcmcia/ss.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <asm/gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/at91rm9200_mc.h>
+#include <mach/board.h>
+#include <mach/at91rm9200_mc.h>
 
 
 /*
index 36cf9bcf3ac1843bca8edeb257b45b8643440450..f3736398900eeb1b581f0c500d1877290855917d 100644 (file)
 
 #include <pcmcia/ss.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
+#include <mach/mux.h>
+#include <mach/tc.h>
 
 
 /* NOTE:  don't expect this to support many I/O cards.  The 16xx chips have
index ff5e3f324f3e70f0d3198995691d0c244b5fe730..1b07af5a2ed3c06924fab1652cb997cb873b52d5 100644 (file)
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
index bb95db7d2b76898bdbd596e25d835d9ba794202b..bcff5cfed051b19a8db8dc21669e31c31153a6fe 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 #include "soc_common.h"
 
index 64f709d0113d44d42ca2a0a4369bcb94d6fd19ba..37ec55df086e384c5d4469b22b7a0afa2e842c6f 100644 (file)
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/lubbock.h>
+#include <mach/pxa-regs.h>
+#include <mach/lubbock.h>
 
 #include "sa1111_generic.h"
 
index b0dcda481522c30d36d0eea570794cdf280a2340..877001db4916c809d4e51356bd9dc84613ac6c7d 100644 (file)
 
 #include <pcmcia/ss.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mainstone.h>
+#include <mach/pxa-regs.h>
+#include <mach/mainstone.h>
 
 #include "soc_common.h"
 
index 4abde190c1f57f59a337478176ce67c01cb35015..a8771ffc61e843451b5dd4879553111aa161a3ff 100644 (file)
@@ -16,8 +16,8 @@
 
 #include <asm/mach-types.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/palmtx.h>
+#include <mach/gpio.h>
+#include <mach/palmtx.h>
 
 #include "soc_common.h"
 
index 58395bff9a72dd9930dbc8dc35f9573cd7034e4a..1cd02f5a23a0e7cbc9de1156ab8a535e2b39e6fe 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/hardware/scoop.h>
 
index 71fbb62804b181d0546fcf49ba31e13655a0989d..f424146a2bc946c6b8a9eb0683e4e7f8afd3c56f 100644 (file)
 #include <linux/device.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/signal.h>
-#include <asm/arch/assabet.h>
+#include <mach/assabet.h>
 
 #include "sa1100_generic.h"
 
index a34279a6788b57f38fca1ecf35d6b578027ebf77..1ca9737ea79ea17c414a9aea9d99ab3a7c7a8cf6 100644 (file)
@@ -18,9 +18,9 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/badge4.h>
+#include <mach/badge4.h>
 #include <asm/hardware/sa1111.h>
 
 #include "sa1111_generic.h"
index bd843bffde59cc7b288dd6b9f3e4617521b9f0e9..63e6bc431a0d71fa5cc847d2637818db44cc211e 100644 (file)
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
-#include <asm/arch/cerf.h>
+#include <mach/cerf.h>
 #include "sa1100_generic.h"
 
 #define CERF_SOCKET    1
index 9017b1302cc7aa79cb8d06beaa29e5906c14a3ff..6de4e1b41d60a8061adca4b39a29c0051658dbc2 100644 (file)
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/h3600.h>
+#include <mach/h3600.h>
 
 #include "sa1100_generic.h"
 
index 15c31dbb0f3ca121870adfcf76b352ea32f493c4..57ca085473d511bb9fc125332b4eecdb5bdf138a 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/mach-types.h>
 
index ace391b69e962205038c1b993d63005d4370570b..4c41e86ccff9c9180999b22aa815d1f4f4f73dcb 100644 (file)
@@ -9,9 +9,9 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/neponset.h>
+#include <mach/neponset.h>
 #include <asm/hardware/sa1111.h>
 
 #include "sa1111_generic.h"
index 16b04270508ad6ce2553a055dbd0025cca3272cd..46d8c1977c2a44592652fc4abfb9ce1aeb1ca3fa 100644 (file)
@@ -9,9 +9,9 @@
 #include <linux/device.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/shannon.h>
+#include <mach/shannon.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 
index 6e6e986543819984ef499a8ffe4232f9613ce3fe..33a08ae09fdfa7aec75ca698548fe46b8d0903ab 100644 (file)
@@ -9,10 +9,10 @@
 #include <linux/device.h>
 #include <linux/init.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
-#include <asm/arch/simpad.h>
+#include <mach/simpad.h>
 #include "sa1100_generic.h"
  
 extern long get_cs3_shadow(void);
index 432c0610582a59e8368095fdb3846210786a06a0..6924d0ea8d3273b75cc13ccb57e9a99d654b302f 100644 (file)
@@ -14,7 +14,7 @@
 
 #include <pcmcia/ss.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/io.h>
 #include <asm/irq.h>
index 7d48201ae1020ccb28017751b299991dfb61f3ea..7cb1273202cc6adbf97ea60c83d0abf8425e3bdb 100644 (file)
@@ -37,7 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
index 95dff38e85f5c5c306d525019257f821e2ed0ac8..c48f3f69bdaf419f7e7394a37e081976244a99af 100644 (file)
@@ -43,7 +43,7 @@
 #include <linux/spinlock.h>
 #include <linux/cpufreq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
@@ -51,7 +51,7 @@
 
 /* FIXME: platform dependent resource declaration has to move out of this file */
 #ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #endif
 
 #ifdef DEBUG
index 244bb273a6371feb081ec239b9b0a0941d7c9433..7035bfa41c629d4b6cd5de35eb9ec82235c74b9a 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/palmtx.h>
+#include <mach/palmtx.h>
 
 static DEFINE_MUTEX(bat_lock);
 static struct work_struct bat_work;
index bf664fbd6610793f48a5ead6ec6323b5fd87cb00..2eab35aab3119cb29c02599b70fa6f826f971ac5 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/tosa.h>
+#include <mach/tosa.h>
 
 static DEFINE_MUTEX(bat_lock); /* protects gpio pins */
 static struct work_struct bat_work;
index cd32d05db773bcc2f16081a75daecbaf9f073a74..4e888cc8be5b1cacbeac68bd054ab3f6f65d295a 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/completion.h>
 
 #include <asm/uaccess.h>
-#include <asm/arch/at91_rtc.h>
+#include <mach/at91_rtc.h>
 
 
 #define AT91_RTC_FREQ          1
index f0246ef413a40a4fca53e2fbf9f77188adce3dcf..2133f37906f2928f8d3ccacf0fc7bcd77aa7d3ce 100644 (file)
@@ -19,8 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/ioctl.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/at91_rtt.h>
+#include <mach/board.h>
+#include <mach/at91_rtt.h>
 
 
 /*
index 9ab53ec63138bb436298b75315b60873a2fc0350..36e4ac0bd69c98b67054a5934eb3efcf3678b508 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define EP93XX_RTC_REG(x)      (EP93XX_RTC_BASE + (x))
 #define EP93XX_RTC_DATA                EP93XX_RTC_REG(0x0000)
index 8054112fc04165e98994b33fc1d096ab271ec708..e7d19b6c265af6e5a285778309d2047f46c82585 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/clk.h>
 #include <linux/log2.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>
index a0982d67e085616a9ec24836ff252ab4dac5bc1f..66a9bb85bbe8698e2b7234b4d26f4b13ef3d52d0 100644 (file)
 #include <linux/pm.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #endif
 
 #define TIMER_FREQ             CLOCK_TICK_RATE
index 075df199cdec00ef617376ae9bfeb0728eb08111..22171b2110a852cfd2fadc611e3220f39dbb349b 100644 (file)
@@ -8,7 +8,7 @@
 #include <linux/linkage.h>
 
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #if defined(__APCS_32__)
 #define LOADREGS(t,r,l...)     ldm##t  r, l
index 73d7773c84160ae3b5482da1611350e0ef478d21..f31c6698419ce99e410e9ac42c58bb1e9ef50df1 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/dec21285.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define BAUD_BASE              (mem_fclk_21285/64)
 
index 1fee12c1f4f8afe1027104d31ddcc6171f05cf11..3a6da80b081c14405ecfdd60660470928843e84c 100644 (file)
 #include <asm/io.h>
 
 #include <asm/mach/serial_at91.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #ifdef CONFIG_ARM
-#include <asm/arch/cpu.h>
-#include <asm/arch/gpio.h>
+#include <mach/cpu.h>
+#include <mach/gpio.h>
 #endif
 
 #define PDC_BUFFER_SIZE                512
index 44d5d267ca17e815874278243a3fb685f1eb3f8c..459f3420a4291de151c5c3767d66dab5d2d48e46 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hardware/clps7111.h>
index db3a2df5e5c91834141fa929a70556dc83db7eb9..6a29f9330a73c72d7799a83ce66a8ecd9a7e5588 100644 (file)
@@ -44,8 +44,8 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/imx-uart.h>
+#include <mach/hardware.h>
+#include <mach/imx-uart.h>
 
 /* Register definitions */
 #define URXD0 0x0  /* Receiver Register */
index edbb85a2cc5b5d9257cf0322bc277d6f098edbdc..3f489329e8d3b45f11a453330bdf65e663ed2dbd 100644 (file)
@@ -35,8 +35,8 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/hardware.h>
+#include <mach/netx-regs.h>
 
 /* We've been assigned a range on the "Low-density serial ports" major */
 #define SERIAL_NX_MAJOR        204
index 033767bed0498e4395c3b36c942a68b53f104504..f7a0d37c42219678bf1d7c8d64bb79deced586ab 100644 (file)
@@ -45,9 +45,9 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 
 struct uart_pxa_port {
index 525130d67f97b83a558b3a60bb2e2be8cd1cca2e..c8b4266ac35fdad490af228ae86479cac300b1a3 100644 (file)
 
 #include <asm/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include "samsung.h"
 
index f9630c6e6f7e938cfbe5a0fec90090f55b9718a4..40a2531b55410897ec5d744b0931943e33caec23 100644 (file)
 #include <linux/serial.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include "samsung.h"
 
index b4c0bb5a0415dbfe8d382a156d06f3b3d1f40230..d0170319c729b6cf847ba2e33cd34754b44bc0e4 100644 (file)
 #include <linux/serial.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include "samsung.h"
 
index ea34faa2f653c479cc7511d614366d40d54491e9..d4a2b17b24985fe350352e389ccb42a836dcd2ad 100644 (file)
 #include <linux/serial.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include "samsung.h"
 
index 6c37a58652c27c3d997b19b10a8bfdbd9f54e0cb..b24a25ea6bc548f73202d21c6835c61d6b10800a 100644 (file)
@@ -39,7 +39,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/serial_sa1100.h>
 
 /* We've been assigned a range on the "Low-density serial ports" major */
index 5b964d4bc04dd54aee6af9dc091fae6817d6c5ba..5a88b3f9fe9b676d1b04a175ca7801c0de447b16 100644 (file)
 
 #include <asm/irq.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
 #include "samsung.h"
 
index 0edbc5dd378bbadedc47ea3196168c1c33e9d810..b9cbfc87f616adee61d6c687c69413bc386bb3e6 100644 (file)
@@ -26,8 +26,8 @@
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/regs-uart.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-uart.h>
+#include <mach/regs-irq.h>
 
 #if defined(CONFIG_SERIAL_KS8695_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
index 95190c619c101240eb9dc43125e05a162b1db379..02f9320f3efcf25000393284e7823f9089d0b7f3 100644 (file)
@@ -20,9 +20,9 @@
 #include <linux/spi/spi.h>
 
 #include <asm/io.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/cpu.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "atmel_spi.h"
 
index f6f987bb71ca39413192c0a3de0e8f2a2ac2e6a0..9d2186fd74aaf7eaca9f9954dde88d1dc11e7c36 100644 (file)
@@ -35,8 +35,8 @@
 
 #include <linux/spi/spi.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/clock.h>
+#include <mach/dma.h>
+#include <mach/clock.h>
 
 
 #define OMAP2_MCSPI_MAX_FREQ           48000000
index e7588e112ec625b7033d7fd10cca514ea66cb8f8..5515eb97d7c57ebacdcc7c4379822af0dd5bb751 100644 (file)
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/omap730.h>  /* OMAP730_IO_CONF registers */
+#include <mach/mux.h>
+#include <mach/omap730.h>      /* OMAP730_IO_CONF registers */
 
 
 /* FIXME address is now a platform device resource,
index 70786f57cdcfb079720acc373e9a58812b6397f2..34c7c9875681708e0fa53485bb3e0e422d43db8d 100644 (file)
 #include <asm/delay.h>
 #include <asm/dma.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/regs-ssp.h>
-#include <asm/arch/ssp.h>
-#include <asm/arch/pxa2xx_spi.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/regs-ssp.h>
+#include <mach/ssp.h>
+#include <mach/pxa2xx_spi.h>
 
 MODULE_AUTHOR("Stephen Street");
 MODULE_DESCRIPTION("PXA2xx SSP SPI Controller");
index 8d7c902c87c5691cbae3344401130c919fcf52db..61ba147e384d5ddfb350115bfecf3fb239e190e0 100644 (file)
@@ -35,9 +35,9 @@
 #include <asm/irq.h>
 #include <asm/delay.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/imx-dma.h>
-#include <asm/arch/spi_imx.h>
+#include <mach/hardware.h>
+#include <mach/imx-dma.h>
+#include <mach/spi_imx.h>
 
 /*-------------------------------------------------------------------------*/
 /* SPI Registers offsets from peripheral base address */
index 89da39f02d6897789aed93839bb221744fa107f3..98abc73c1a1d298f5431a01be4f87aec73911d9a 100644 (file)
 
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 struct s3c24xx_spi {
        /* bitbang has to be first */
index d44fd0af0da19ea78bcad4aea4743e3b6b493f5d..cc1f647f579bc3019302a4c430ee71d946afd454 100644 (file)
@@ -21,9 +21,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/spi-gpio.h>
-#include <asm/arch/hardware.h>
+#include <mach/regs-gpio.h>
+#include <mach/spi-gpio.h>
+#include <mach/hardware.h>
 
 struct s3c2410_spigpio {
        struct spi_bitbang               bitbang;
index 5b935e9ebf9960317fea5f8f6ed2addce8c0dee5..a8a1de41332135907ab27718f07633b155dc83ef 100644 (file)
 #include <linux/usb/gadget.h>
 
 #include <asm/byteorder.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/at91sam9261_matrix.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
+#include <mach/at91sam9261_matrix.h>
 
 #include "at91_udc.h"
 
index 07e5a0b5dcda49ea70aef4a5ee8f6b814fbf2a79..ae30ab1d264f46c6b45aafeca88f1491781b3c42 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include "atmel_usba_udc.h"
 
@@ -334,7 +334,7 @@ static void toggle_bias(int is_on)
 
 #elif defined(CONFIG_ARCH_AT91)
 
-#include <asm/arch/at91_pmc.h>
+#include <mach/at91_pmc.h>
 
 static void toggle_bias(int is_on)
 {
index fd43b90df03edd2c3cea068f1a63a73c7f7b9ec8..ca861203a301c83a468ef3061832d865bb3449cf 100644 (file)
@@ -47,7 +47,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/unaligned.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
index 395bd18444828577a97487ca87f9cd289d8e1095..376e80c07530eba7093de756fdfa107a1e1348ef 100644 (file)
@@ -52,8 +52,8 @@
 #include <asm/unaligned.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/usb.h>
+#include <mach/dma.h>
+#include <mach/usb.h>
 
 #include "omap_udc.h"
 
index 7e6725d8997663b81b719a87e48b974f120b00cb..da6e93c201d20183b7d804591f880cf6005e6683 100644 (file)
@@ -61,7 +61,7 @@
  * This driver is PXA25x only.  Grab the right register definitions.
  */
 #ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa25x-udc.h>
+#include <mach/pxa25x-udc.h>
 #endif
 
 #include <asm/mach/udc_pxa2xx.h>
index c8a13215e02c6c5c7294839b33b7409b9aaeb228..1d51aa21e6eb0d6f16e5d49c0dd8a8968b60a780 100644 (file)
@@ -139,7 +139,7 @@ struct pxa25x_udc {
 /*-------------------------------------------------------------------------*/
 
 #ifdef CONFIG_ARCH_LUBBOCK
-#include <asm/arch/lubbock.h>
+#include <mach/lubbock.h>
 /* lubbock can also report usb connect/disconnect irqs */
 #endif
 
index 06c81a3c927778d54934b3cd263bb695f375a389..a28513ecbe5bd3de7c675a6a7c9afb99246f63ec 100644 (file)
 #include <linux/irq.h>
 
 #include <asm/byteorder.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-#include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */
-#include <asm/arch/udc.h>
+#include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */
+#include <mach/udc.h>
 
 #include "pxa27x_udc.h"
 
index 021955a57722b411d1499980b1ea7b1b9815ab46..538807384592cc76905e2f6134227a5a5e88c99e 100644 (file)
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/unaligned.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/regs-udc.h>
 #include <asm/plat-s3c24xx/udc.h>
@@ -887,7 +887,7 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
        }
 }
 
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-irq.h>
 
 /*
  *     s3c2410_udc_irq - interrupt handler
index 389a8f1bbc69d1a63366cdf418968f2f3fd0b2f6..6db7a2889e6648f50344d4d42e3a2c04d332a91b 100644 (file)
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/gpio.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
 
 #ifndef CONFIG_ARCH_AT91
 #error "CONFIG_ARCH_AT91 must be defined."
index 4d628a9c6d899f54f45d3fc2597180920cbe3d2a..cb0b506f8259b20237854bfaae4f9b290223b82a 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/signal.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static struct clk *usb_host_clock;
 
index 020769b694311bc307cea757a2eefee01d78f753..9e31d440d115e7e8260476bcd81e39fd80b026e1 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/signal.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 
 extern int usb_disabled(void);
index 9b7e9102fb98a2edc6a381ee5bdbd6bd00b64faf..94dfca02f7e169228197c0a9ebf6b3cd970fade1 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/fpga.h>
-#include <asm/arch/usb.h>
+#include <mach/mux.h>
+#include <mach/irqs.h>
+#include <mach/gpio.h>
+#include <mach/fpga.h>
+#include <mach/usb.h>
 
 
 /* OMAP-1510 OHCI has its own MMU for DMA */
index ff4d928eb11798732ee2fa2ef818cc0da682e0ad..b02cd0761977aed3bf6c85eda07227a6bfe8d4c1 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
-#include <asm/arch/platform.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/gpio.h>
+#include <mach/platform.h>
+#include <mach/irqs.h>
+#include <mach/gpio.h>
 
 #define USB_CTRL       IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
 
index 3eb2c28e608d95b81414e1cb93aa068883da7d4e..8c9c4849db6efc5fedfec17201622f60a6df9174 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */
-#include <asm/arch/ohci.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */
+#include <mach/ohci.h>
 
 #define PXA_UHC_MAX_PORTNUM    3
 
index 358100c8dfa3f9bfa2dbd66d625e6f661ce36021..9e3dc4069e8bc9cb4dac244f1b8dfa5f276ff9ac 100644 (file)
@@ -22,8 +22,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/usb-control.h>
+#include <mach/hardware.h>
+#include <mach/usb-control.h>
 
 #define valid_port(idx) ((idx) == 1 || (idx) == 2)
 
index a3a8fea6d3636c6894896724d55c839cfa5e5a78..4626b002e670f15a5a93a1f8cf1c80edf12480b9 100644 (file)
  * This file is licenced under the GPL.
  */
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/assabet.h>
-#include <asm/arch/badge4.h>
+#include <mach/assabet.h>
+#include <mach/badge4.h>
 #include <asm/hardware/sa1111.h>
 
 #ifndef CONFIG_SA1111
index bad26c65d9bfa888fd897179abd76d96cf6a01be..61c3d3f40fd180463df2967d2a3373f644b0244c 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -339,7 +339,7 @@ acornfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 #endif
 
 #ifdef HAS_VIDC20
-#include <asm/arch/acornfb.h>
+#include <mach/acornfb.h>
 
 #define MAX_SIZE       2*1024*1024
 
index 32dd85126931479f16d79685721e4c2e038a4daf..0c35b8b0160e0cf3cc13398c399bfb74d62f2ee5 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <video/metronomefb.h>
 
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 /* register offsets for gpio control */
 #define LED_GPIO_PIN 51
index 5b3a15dffb5f536304eca7d1746b44c0e62c86ad..e7018a2f56afd29e2e7d9b40aa082d79defe827d 100644 (file)
@@ -18,9 +18,9 @@
 #include <linux/delay.h>
 #include <linux/backlight.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/gpio.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
+#include <mach/gpio.h>
 
 #include <video/atmel_lcdc.h>
 
index 891875d53a494050bce6cb7c548f5a62f58fa8f9..cbad67e898260dd52e211c20e6bf7373efd74307 100644 (file)
@@ -25,9 +25,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/board.h>
+#include <mach/mux.h>
 
 #define OMAPBL_MAX_INTENSITY           0xff
 
index 3701caa367e4746f9b4c345fc6669f9b8acaa613..16f5db471ab5e4f63aeb68746351770515e54bbf 100644 (file)
 #include <linux/proc_fs.h>
 #include <linux/delay.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <linux/uaccess.h>
 
 #include <asm/hardware/clps7111.h>
-#include <asm/arch/syspld.h>
+#include <mach/syspld.h>
 
 struct fb_info *cfb;
 
index d0e4cb618269b7c44c5c920def6e3bbc49e807f6..41d62632dcdb06bfc4b62f3266bb0ad6e8bda7ca 100644 (file)
@@ -1425,7 +1425,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
 
 #ifdef CONFIG_ARCH_SHARK
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static int __devinit cyberpro_vl_probe(void)
 {
index cc2810ef5de5d8467ac30566448454d0cdd5598e..2735b79e52a1d52bfc2035d0ca1c514d939dda78 100644 (file)
@@ -71,7 +71,7 @@ struct epson1355_par {
 #if defined(CONFIG_ARM)
 
 # ifdef CONFIG_ARCH_CEIVA
-#  include <asm/arch/hardware.h>
+#  include <mach/hardware.h>
 #  define EPSON1355FB_BASE_PHYS        (CEIVA_PHYS_SED1355)
 # endif
 
index d28879fd3a294d703b017807cfb85e5d84bcfd2c..ccd986140c95ca71c56778a26819e4985eb89da1 100644 (file)
@@ -33,9 +33,9 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imxfb.h>
 
 /*
  * Complain if VAR is out of range.
index 4d8ad9cd0e19701c0b8c15135ac08610680f107d..9dfcf39d3367370c0d3ec2507aa3bb3e036edef6 100644 (file)
@@ -26,9 +26,9 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/blizzard.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/blizzard.h>
 
 #include "dispc.h"
 
index ab77c51fe9d620bc4f41f0816fb4999d7e1bddaf..6efcf89e7fbe9667e9f4722e91fd8dfeb0964bd3 100644 (file)
@@ -25,9 +25,9 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/sram.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/board.h>
+#include <mach/sram.h>
+#include <mach/omapfb.h>
+#include <mach/board.h>
 
 #include "dispc.h"
 
index 1e642b7a20fed1d7d63958c2a6a410de9040915a..f24df0b54e1cad0ff54ab68d5439b99fd8ae03c0 100644 (file)
@@ -26,9 +26,9 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/hwa742.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
+#include <mach/hwa742.h>
 
 #define HWA742_REV_CODE_REG       0x0
 #define HWA742_CONFIG_REG         0x2
index 31e978349a806bfe05b089717c4d3d4357e97f51..2486237ebba5c9e457b6830c8c186a3d3f2133f9 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/tps65010.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME    "omapfb-lcd_h3"
 
index fd6f0eb16de1cc0057178da1aeec5859d7caabd5..88c19d424ef769f32f1fe9fa23996b7214f4e9ec 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
index 551f385861d1c1fef7a4181ff36809004d207e8d..6953ed4b58209ebf7894953cc64f8bdf4b7dae63 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/omapfb.h>
+#include <mach/fpga.h>
+#include <mach/omapfb.h>
 
 static int innovator1510_panel_init(struct lcd_panel *panel,
                                    struct omapfb_device *fbdev)
index 5ef119c813e00dffd32c2bdbe486a915fa39ae36..6a42c6a0cd9991466b1a77781873e05b3171fcd8 100644 (file)
@@ -22,8 +22,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME    "omapfb-lcd_h3"
 
index a38038840fd630d3dc12e38337ef39a273229708..a4a725f427a487843b03cad5e45abbf4fd230004 100644 (file)
@@ -23,9 +23,9 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
index 52bdfdac42c9c7a9052e1581c2ac60ec1e25e9fa..218317366e6e511c2d2eb029b3ddf7856616ba76 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/fpga.h>
-#include <asm/arch/omapfb.h>
+#include <mach/fpga.h>
+#include <mach/omapfb.h>
 
 static int palmte_panel_init(struct lcd_panel *panel,
                                struct omapfb_device *fbdev)
index 4bb349f54356a60a52097411af32db8ee93a1702..57b0f6cf6a5a63eb84f64aac601d819144c795cb 100644 (file)
@@ -29,8 +29,8 @@ GPIO13 - screen blanking
 #include <linux/module.h>
 #include <linux/io.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 static int palmtt_panel_init(struct lcd_panel *panel,
        struct omapfb_device *fbdev)
index ea6170ddff3593848441ad9214c9c761a5620d51..d33d78b11723782feabccb7910439cf3d06e7daf 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 static int palmz71_panel_init(struct lcd_panel *panel,
                              struct omapfb_device *fbdev)
index c4f306a4e5c96354eee3b808694e072b6d56c733..caa6a896cb8b7d84912dceb6a45b7e3871f3c588 100644 (file)
 #include <linux/delay.h>
 #include <linux/io.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/mux.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
+#include <mach/mcbsp.h>
+#include <mach/mux.h>
 
 /*
  * OMAP310 GPIO registers
index fb19ed4992dbc670d9f89c017995bd8c8faa9d5d..83514f066712c4d3157b9c3c1c1b2a72d7b82d68 100644 (file)
@@ -29,8 +29,8 @@
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #include <asm/mach-types.h>
 
index d9abc48a210b02de83fb6548024ba1d9ba61cd3e..51a138bd113c0a42a4d385bf0af2ab4e8b790ab6 100644 (file)
@@ -28,8 +28,8 @@
 #include <linux/mm.h>
 #include <linux/uaccess.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME    "omapfb"
 
index 789cfd23c36b1477734b59f9e5accdcead17e6fd..4a6f13d3facf9d69ed984036d599248f5dfd328e 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 #include "dispc.h"
 
index fafd0f26b90f78028afff02d220673a588f6252b..6359353c2c67feb92f0d004d2f93fbb1cce35e38 100644 (file)
@@ -24,8 +24,8 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/omapfb.h>
+#include <mach/dma.h>
+#include <mach/omapfb.h>
 
 #include "lcdc.h"
 
index d80a614d89ed3af34897b9a08ff14d83615d19a7..1234d4375d9249a01735d4717164089756be0de0 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef __PNX008_DUM_H__
 #define __PNX008_DUM_H__
 
-#include <asm/arch/platform.h>
+#include <mach/platform.h>
 
 #define PNX4008_DUMCONF_VA_BASE                IO_ADDRESS(PNX4008_DUMCONF_BASE)
 #define PNX4008_DUM_MAIN_VA_BASE       IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE)
index d23bf0d659b63c97b12be85f8b805c8de81cd31d..2aa09bce3944bdb2b0b9fb73fbf878d5fb31aff7 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <asm/uaccess.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #include "sdum.h"
 #include "fbcommon.h"
index 3169ea4831efe6af044224842559d9ab160c984a..e7aa7ae8fca8e3d3fe89fb6968ed4073bca3b834 100644 (file)
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/bitfield.h>
-#include <asm/arch/pxafb.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/bitfield.h>
+#include <mach/pxafb.h>
 
 /*
  * Complain if VAR is out of range.
index f0598961c6b04be94d20fdae77e5281f7096f6cf..79cf0b1976aa19b618dce166d54044e48ecc7012 100644 (file)
@@ -29,9 +29,9 @@
 #include <asm/div64.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/fb.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/fb.h>
 
 #ifdef CONFIG_PM
 #include <linux/pm.h>
index 8fbcce6d069d7c496f7496a03c33abeb72bc7dc1..c052bd4c0b0676c7d843ec5d465afed6fb56d1c8 100644 (file)
 #include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/assabet.h>
-#include <asm/arch/shannon.h>
+#include <mach/assabet.h>
+#include <mach/shannon.h>
 
 /*
  * debugging?
index 9ff9a9565320628d5b73c7637e5fd5754b9896ee..bf872aa2b9f3cd66aee23574f42a425b54d7d1f1 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <asm/uaccess.h>
-#include <asm/arch/at91_st.h>
+#include <mach/at91_st.h>
 
 
 #define WDT_DEFAULT_TIME       5       /* seconds */
index 2ec36e0d8cfe3cd6ef36ff3d86f54b988e80c70d..003dffe5cb19b6e0f9031cd6de420fa705ac7d30 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
index 7476844dbac3cc3ad61523f2a52e360ba6eee519..af8ef14c0e4ce784078b61f7766d4ca7beaff390 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 
 #define WDT_VERSION    "0.3"
index d37146f11e47a86d5afb7430dcb7a1cc0af60b07..1946dd06d815c858d9189b2975314c067f419bb8 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned long wdt_status;
index 884c2b435bea24a6d0bd8234ea0dea57a44affec..4226dae7d26016877ea9167675093ac4d66f9552 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
index d4d37dac1072b213b79a1687ccaa6719f52dc42f..2313fad0dbb11091f9aee5557aa587e1d7ae0c81 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
index df5a6b811ccd4d5f0004feeb3e6d856267de4892..d21a6407fe2136d0dc42dc7173d0e8142c461384 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/watchdog.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/arch/regs-timer.h>
+#include <mach/regs-timer.h>
 
 
 #define WDT_DEFAULT_TIME       5       /* seconds */
index 6dfb9cf155829f9f0d69c089b1c62eab97e6243e..74a10d50607bd557acfacbbdcfb65e23d9e2e06d 100644 (file)
@@ -43,9 +43,9 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/prcm.h>
+#include <mach/prcm.h>
 
 #include "omap_wdt.h"
 
index 11a206781d0f13dc801274d8fb00e87208911b61..f431a0427eaa1c91cd238abbc6866ca2fcbf96a4 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/clk.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
index 97b4a2e8eb09a62db3e5fa0eae184952be4e76b3..f1fe800658f408f933d437c4302172c2341e36f4 100644 (file)
@@ -49,7 +49,7 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
-#include <asm/arch/map.h>
+#include <mach/map.h>
 
 #undef S3C_VA_WATCHDOG
 #define S3C_VA_WATCHDOG (0)
index d985cba40dde99421ac19f09fffb1d6ba03f7fae..52a533c274fdda2afc785e00af1af6f76ffa7637 100644 (file)
 #include <linux/bitops.h>
 
 #ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 #endif
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/uaccess.h>
 
 #define OSCR_FREQ              CLOCK_TICK_RATE
index 00cd6f21e7692d13a9ff1e8ef671da0cc569f36d..94e2d91c9ac97806e2b1904db1dc7badd41c9b3f 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/dec21285.h>
 
diff --git a/include/asm-arm/arch-ep93xx/dma.h b/include/asm-arm/arch-ep93xx/dma.h
deleted file mode 100644 (file)
index 898b3ab..0000000
+++ /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 (file)
index 4d0b302..0000000
+++ /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 (file)
index 4140bdd..0000000
+++ /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 (file)
index 205ea6b..0000000
+++ /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 (file)
index 0a70baa..0000000
+++ /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 (file)
index 66f545a..0000000
+++ /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 (file)
index 2f4335e..0000000
+++ /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 (file)
index f6828fd..0000000
+++ /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 (file)
index 41852c6..0000000
+++ /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 (file)
index f5be062..0000000
+++ /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 (file)
index f2c5121..0000000
+++ /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 (file)
index 2b3061e..0000000
+++ /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 (file)
index 2fb1c6f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * linux/include/asm-arm/arch-sa1100/vmalloc.h
- */
-#define VMALLOC_END       (0xe8000000)
index d08a1f2863e472051e3e60327c13b3bfbfcf99d6..5106acaa1d0ebfe1252e54a46ebd206ca6f5729f 100644 (file)
@@ -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>
index ad6bbe90616e2e026810deabffe71f90fafd2ab5..f4dcd14af05957cb197a095377c325c5d01b1362 100644 (file)
@@ -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>
index b004dee6bcafa6f9599d75f3f77242988ef3afd9..c3878f7acb83fb33ac39d370ecd384e42bc4a473 100644 (file)
@@ -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/
index c7f231963e7607b30a108bb5526d1d7885ef5ccf..4323cccc86cd916b2452882b76ce644796728f1b 100644 (file)
@@ -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>
  *
index 2ae29522f2538ccd0ea319ee6713654e40874309..2f7c17de8ac8f1c1812080f50cca36ca537a1a59 100644 (file)
@@ -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/
index d742205ac172673f57c96f99e93d4125b945e46e..09f0b5503f5bd2bec6fb0b23eae550e0a86b954a 100644 (file)
@@ -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/
index 93b03c49710a561783ef47d1742ba1678d78d4f7..d5837cf8e402751493f51f3889302891df4556a5 100644 (file)
@@ -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/
index 923e114db663a6f3dac75240712e4a09e737d8e3..a0daa647b92ce4ffc2f327c23045cc69faca118d 100644 (file)
@@ -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
  *
index b5bc692f3489d1020357a75d92ed7797ca001024..b4366ea39677f65fe3a92a7650c800eff1f4513b 100644 (file)
@@ -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/
index 56c4193b7a46c9402a8b13530cef81658abaab6d..1229f076c0a06fbb5dfa93c9143d6daee160ee62 100644 (file)
@@ -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/
index eaf77916a602e1b1710b5288f1f30903a82dff64..a6f1d5df13b4631ba7a129133f307d274f50d5fe 100644 (file)
@@ -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/
index ea565b007d0496e9c59d6b70e7185c672c8317c2..2b35479ee35c947071ab624b3f268f828703bbb5 100644 (file)
@@ -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
  *
index e1e9805d2d9a42454d14e2ac0f7bf3f729ed1b15..f0dd4a41b37babecba444871b7222059eef61762 100644 (file)
@@ -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>
  *
index b8aa6cb69b58ec5c8a7269ea9e2a54398db00d9d..546bb4008f49cf240fc21351c7d25a4f06fbe5a4 100644 (file)
@@ -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>
  *
index 158f7b50b780852532720fa880d0f96cd346e2a3..199cca3366df244b4fd05c5125ac096a0ade0f73 100644 (file)
 
 #include <asm/irq.h>
 #include <linux/mutex.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/audio.h>
 
 #include "pxa2xx-pcm.h"
 
index 9a104e2430f57f9f1f9210e323fd0b3387ea5a3d..381094aab2355e854914ad3f7c677f93f3e6b6e8 100644 (file)
@@ -21,8 +21,8 @@
 #include <sound/pcm_params.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 
 #include "pxa2xx-pcm.h"
 
index 40c213e70593959273061252ba3918a24548d902..b9c51bf8cd71a3c09af66dbc705c560d1a3cfe71 100644 (file)
@@ -71,8 +71,8 @@
 #include <linux/pm.h>
 #endif
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/h3600.h>
+#include <mach/hardware.h>
+#include <mach/h3600.h>
 #include <asm/mach-types.h>
 #include <asm/dma.h>
 
index 41cd4f25de0435953e0d51fc765de931c8f7f2bb..725fef0f59a379d5dd8e2a71e1993dcf151046fb 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>
index d2cb210cc402678c37d5061267068c0de296cf20..bed34921d17624b23964be49020ef5437ffc0390 100644 (file)
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iomd.h>
 
                .text
index d84c49787f6f5b7c5476e6a4b935d810238e3996..c47842fad6575852a769bcb4ecf5f3c657d8455d 100644 (file)
@@ -47,7 +47,7 @@
 #include "waveartist.h"
 
 #ifdef CONFIG_ARM
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #endif
 
index fee5f8e589575ab783a44c5366d1438c4e50bb28..3f326219f1ec182dba666bcf01d5c12e4d258377 100644 (file)
@@ -36,8 +36,8 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/portmux.h>
 
 #include "../codecs/wm8510.h"
 #include "at32-pcm.h"
index d47492b2b6e5db1494e466de57da06248cbc2ac0..7ab48bd25e4c2f82b97bc637ded34e6c41a1d6c7 100644 (file)
@@ -28,8 +28,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_ssc.h>
+#include <mach/hardware.h>
+#include <mach/at91_ssc.h>
 
 #include "at91-pcm.h"
 
index 58d0f00a07b2ee0597f1721c58d1f36ec2af3442..e5aada2cb10285100a494812d299f81bc1250a9c 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef _AT91_PCM_H
 #define _AT91_PCM_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 struct at91_ssc_periph {
        void __iomem    *base;
index 090e607f86924b496e5a96a5795673d15b32e7f8..5d44515e62e0b58e6d316e517d749bfd8cca681e 100644 (file)
@@ -28,9 +28,9 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_ssc.h>
+#include <mach/hardware.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_ssc.h>
 
 #include "at91-pcm.h"
 #include "at91-ssc.h"
index d61a4537e60440d34a63c842a6141daa1f47c1db..b081e83766b7bcf321faaaf17cfc25297089c0b6 100644 (file)
@@ -33,8 +33,8 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
 
 #include "../codecs/wm8731.h"
 #include "at91-pcm.h"
index 0722eebe3d6a7762f1e5ca6bc002ebbfec3583e0..65fdbd81a379c022589697eda8445dd62380bf83 100644 (file)
@@ -20,7 +20,7 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "../codecs/tlv320aic3x.h"
 #include "davinci-pcm.h"
index 02cec96859b8444133a1cf3a464533bdd87c67cf..7694621ec40b7e8747a80b5f2131b926a3b8f634 100644 (file)
@@ -29,9 +29,9 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <linux/gpio.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
index 00b0c9d73cd4ee7460f1260c32efae8d31e5bf18..35310e16d7f3658623fdf9755ae6df7190688a1e 100644 (file)
@@ -30,9 +30,9 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <asm/arch/control.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/control.h>
+#include <mach/dma.h>
+#include <mach/mcbsp.h>
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
 
index e092f3d836d0a080a2579f4a93aa0237dd6cc1d3..690bfeaec4a0ee3b157b0ccb7a7ea1a1ea5e4189 100644 (file)
@@ -27,7 +27,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include "omap-pcm.h"
 
 static const struct snd_pcm_hardware omap_pcm_hardware = {
index c0294464a23aef4f14c099b989dc058168b4da6a..0a53f72077fdc97b5797960dc84e8db9177d28ce 100644 (file)
 
 #include <asm/mach-types.h>
 #include <asm/hardware/scoop.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/corgi.h>
-#include <asm/arch/audio.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/corgi.h>
+#include <mach/audio.h>
 
 #include "../codecs/wm8731.h"
 #include "pxa2xx-pcm.h"
index 06e8afb2527768d1b3324e7ebeb00c8961c61722..6781c5be242fb75e3716eaa5bdbc3de3baf4c336 100644 (file)
@@ -21,9 +21,9 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/audio.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
index 02dcac39cdf6cc9bd71c4440a367092e7d2153f4..d9c3f7b28be212ecdb7cc1bf62ce22d09f2808df 100644 (file)
@@ -30,9 +30,9 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/audio.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
index d968cf71b569f9056d8668d333e1bdb9594d36fb..a4697f7e2921b42735ea0fd3f3589f6ed71a2d5d 100644 (file)
 
 #include <asm/mach-types.h>
 #include <asm/hardware/locomo.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/poodle.h>
-#include <asm/arch/audio.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/poodle.h>
+#include <mach/audio.h>
 
 #include "../codecs/wm8731.h"
 #include "pxa2xx-pcm.h"
index b45a4f199ef79ee4ac7cae2f5704f963b8c2e249..d94a495bd6bdc3c84e716de3d60b30ca84620602 100644 (file)
 
 #include <asm/irq.h>
 #include <linux/mutex.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/audio.h>
 
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-ac97.h"
index f69870f4f673f1f512043817c5c30c7116da1cfd..8548818eea085f0b89be4721a296431de5f52795 100644 (file)
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/audio.h>
 
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-i2s.h"
index 77708f879c964a69f45bf1b252193b9603d982d5..4345f387fe41f7891d95fddfa37efad8fd2e68e0 100644 (file)
@@ -22,9 +22,9 @@
 #include <sound/soc.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/audio.h>
 
 #include "pxa2xx-pcm.h"
 
index 64385797da5d3e0c959c737eaea442e22c0778f0..eefc25b83514c399d3f7481f29576fee86a8c63b 100644 (file)
 
 #include <asm/mach-types.h>
 #include <asm/hardware/scoop.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/akita.h>
-#include <asm/arch/spitz.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/akita.h>
+#include <mach/spitz.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-i2s.h"
index 22971a0f040ea3c019d085ce98916590c32bf755..2baaa750f123013f566fb351e972651a967db382 100644 (file)
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/tosa.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/audio.h>
+#include <mach/tosa.h>
+#include <mach/pxa-regs.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-pcm.h"
index 47bf9a0aab79f5e1dea3fd938eec01553fbd1501..8089f8ee05c0413f2bf4ff7f9b365a26228a8895 100644 (file)
 #include <sound/tlv.h>
 
 #include <asm/hardware/scoop.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/audio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
 #include <linux/io.h>
-#include <asm/arch/spi-gpio.h>
+#include <mach/spi-gpio.h>
 
 #include <asm/plat-s3c24xx/regs-iis.h>
 
index 59c3d5355f555c93fb4cae37fd2df4fb65164cd1..ded7d995a9228a5f0d9080cbc4575cfd2216cd32 100644 (file)
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include <linux/io.h>
 #include <asm/dma.h>
 
 #include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/dma.h>
+#include <mach/regs-gpio.h>
+#include <mach/audio.h>
+#include <mach/dma.h>
 
 #include "s3c24xx-pcm.h"
 #include "s3c2412-i2s.h"
index a37167398ab509788e8d037e27236ee95fa54f00..19c5c3cf5d8c64138e31d9b70b489768309159a1 100644 (file)
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/audio.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/audio.h>
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 #include "s3c24xx-pcm.h"
 #include "s3c24xx-ac97.h"
index ff614d645e7957c89265798ef7958ada940c6593..ba4476b55fbcc1f0e67f1311418fd015b1f3bef4 100644 (file)
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+#include <mach/audio.h>
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 #include <asm/plat-s3c24xx/regs-iis.h>
 
index fadd33e2a733807367c533e187650645056adcb1..e13e614bada9aca7beeaecd85b8eb3f14f92a2a8 100644 (file)
@@ -27,9 +27,9 @@
 #include <sound/soc.h>
 
 #include <asm/dma.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/dma.h>
+#include <mach/audio.h>
 
 #include "s3c24xx-pcm.h"