Move architecture-specific includes to arch/$ARCH/include/asm

This helps to clean up the include/ directory so that it only contains
non-architecture-specific headers and also matches Linux's directory
layout which many U-Boot developers are already familiar with.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/include/asm-arm/arch-a320/a320.h b/arch/arm/include/asm/arch-a320/a320.h
similarity index 100%
rename from include/asm-arm/arch-a320/a320.h
rename to arch/arm/include/asm/arch-a320/a320.h

diff --git a/include/asm-arm/arch-a320/ftpmu010.h b/arch/arm/include/asm/arch-a320/ftpmu010.h
similarity index 100%
rename from include/asm-arm/arch-a320/ftpmu010.h
rename to arch/arm/include/asm/arch-a320/ftpmu010.h

diff --git a/include/asm-arm/arch-a320/ftsdmc020.h b/arch/arm/include/asm/arch-a320/ftsdmc020.h
similarity index 100%
rename from include/asm-arm/arch-a320/ftsdmc020.h
rename to arch/arm/include/asm/arch-a320/ftsdmc020.h

diff --git a/include/asm-arm/arch-a320/ftsmc020.h b/arch/arm/include/asm/arch-a320/ftsmc020.h
similarity index 100%
rename from include/asm-arm/arch-a320/ftsmc020.h
rename to arch/arm/include/asm/arch-a320/ftsmc020.h

diff --git a/include/asm-arm/arch-a320/fttmr010.h b/arch/arm/include/asm/arch-a320/fttmr010.h
similarity index 100%
rename from include/asm-arm/arch-a320/fttmr010.h
rename to arch/arm/include/asm/arch-a320/fttmr010.h

diff --git a/include/asm-arm/arch-arm720t/hardware.h b/arch/arm/include/asm/arch-arm720t/hardware.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/hardware.h
rename to arch/arm/include/asm/arch-arm720t/hardware.h

diff --git a/include/asm-arm/arch-arm720t/netarm_dma_module.h b/arch/arm/include/asm/arch-arm720t/netarm_dma_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_dma_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_dma_module.h

diff --git a/include/asm-arm/arch-arm720t/netarm_eni_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eni_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_eni_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_eni_module.h

diff --git a/include/asm-arm/arch-arm720t/netarm_eth_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eth_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_eth_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_eth_module.h

diff --git a/include/asm-arm/arch-arm720t/netarm_gen_module.h b/arch/arm/include/asm/arch-arm720t/netarm_gen_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_gen_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_gen_module.h

diff --git a/include/asm-arm/arch-arm720t/netarm_mem_module.h b/arch/arm/include/asm/arch-arm720t/netarm_mem_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_mem_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_mem_module.h

diff --git a/include/asm-arm/arch-arm720t/netarm_registers.h b/arch/arm/include/asm/arch-arm720t/netarm_registers.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_registers.h
rename to arch/arm/include/asm/arch-arm720t/netarm_registers.h

diff --git a/include/asm-arm/arch-arm720t/netarm_ser_module.h b/arch/arm/include/asm/arch-arm720t/netarm_ser_module.h
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_ser_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_ser_module.h

diff --git a/include/asm-arm/arch-arm925t/sizes.h b/arch/arm/include/asm/arch-arm925t/sizes.h
similarity index 100%
rename from include/asm-arm/arch-arm925t/sizes.h
rename to arch/arm/include/asm/arch-arm925t/sizes.h

diff --git a/include/asm-arm/arch-arm926ejs/sizes.h b/arch/arm/include/asm/arch-arm926ejs/sizes.h
similarity index 100%
rename from include/asm-arm/arch-arm926ejs/sizes.h
rename to arch/arm/include/asm/arch-arm926ejs/sizes.h

diff --git a/include/asm-arm/arch-at91/at91_common.h b/arch/arm/include/asm/arch-at91/at91_common.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_common.h
rename to arch/arm/include/asm/arch-at91/at91_common.h

diff --git a/include/asm-arm/arch-at91/at91_emac.h b/arch/arm/include/asm/arch-at91/at91_emac.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_emac.h
rename to arch/arm/include/asm/arch-at91/at91_emac.h

diff --git a/include/asm-arm/arch-at91/at91_matrix.h b/arch/arm/include/asm/arch-at91/at91_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_matrix.h
rename to arch/arm/include/asm/arch-at91/at91_matrix.h

diff --git a/include/asm-arm/arch-at91/at91_mc.h b/arch/arm/include/asm/arch-at91/at91_mc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_mc.h
rename to arch/arm/include/asm/arch-at91/at91_mc.h

diff --git a/include/asm-arm/arch-at91/at91_pdc.h b/arch/arm/include/asm/arch-at91/at91_pdc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pdc.h
rename to arch/arm/include/asm/arch-at91/at91_pdc.h

diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pio.h
rename to arch/arm/include/asm/arch-at91/at91_pio.h

diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/include/asm/arch-at91/at91_pit.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pit.h
rename to arch/arm/include/asm/arch-at91/at91_pit.h

diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pmc.h
rename to arch/arm/include/asm/arch-at91/at91_pmc.h

diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_rstc.h
rename to arch/arm/include/asm/arch-at91/at91_rstc.h

diff --git a/include/asm-arm/arch-at91/at91_spi.h b/arch/arm/include/asm/arch-at91/at91_spi.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_spi.h
rename to arch/arm/include/asm/arch-at91/at91_spi.h

diff --git a/include/asm-arm/arch-at91/at91_st.h b/arch/arm/include/asm/arch-at91/at91_st.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_st.h
rename to arch/arm/include/asm/arch-at91/at91_st.h

diff --git a/include/asm-arm/arch-at91/at91_tc.h b/arch/arm/include/asm/arch-at91/at91_tc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_tc.h
rename to arch/arm/include/asm/arch-at91/at91_tc.h

diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/include/asm/arch-at91/at91_wdt.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91_wdt.h
rename to arch/arm/include/asm/arch-at91/at91_wdt.h

diff --git a/include/asm-arm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91cap9.h
rename to arch/arm/include/asm/arch-at91/at91cap9.h

diff --git a/include/asm-arm/arch-at91/at91cap9_matrix.h b/arch/arm/include/asm/arch-at91/at91cap9_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91cap9_matrix.h
rename to arch/arm/include/asm/arch-at91/at91cap9_matrix.h

diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91rm9200.h
rename to arch/arm/include/asm/arch-at91/at91rm9200.h

diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9260.h
rename to arch/arm/include/asm/arch-at91/at91sam9260.h

diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9260_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9260_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9261.h
rename to arch/arm/include/asm/arch-at91/at91sam9261.h

diff --git a/include/asm-arm/arch-at91/at91sam9261_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9261_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9261_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9261_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9263.h
rename to arch/arm/include/asm/arch-at91/at91sam9263.h

diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9263_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9263_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9263_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_sdramc.h
rename to arch/arm/include/asm/arch-at91/at91sam9_sdramc.h

diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/include/asm/arch-at91/at91sam9_smc.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_smc.h
rename to arch/arm/include/asm/arch-at91/at91sam9_smc.h

diff --git a/include/asm-arm/arch-at91/at91sam9g45.h b/arch/arm/include/asm/arch-at91/at91sam9g45.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9g45.h
rename to arch/arm/include/asm/arch-at91/at91sam9g45.h

diff --git a/include/asm-arm/arch-at91/at91sam9g45_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9g45_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/arch/arm/include/asm/arch-at91/at91sam9rl.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9rl.h
rename to arch/arm/include/asm/arch-at91/at91sam9rl.h

diff --git a/include/asm-arm/arch-at91/at91sam9rl_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9rl_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h

diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/include/asm/arch-at91/clk.h
similarity index 100%
rename from include/asm-arm/arch-at91/clk.h
rename to arch/arm/include/asm/arch-at91/clk.h

diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/include/asm/arch-at91/gpio.h
similarity index 100%
rename from include/asm-arm/arch-at91/gpio.h
rename to arch/arm/include/asm/arch-at91/gpio.h

diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h
similarity index 100%
rename from include/asm-arm/arch-at91/hardware.h
rename to arch/arm/include/asm/arch-at91/hardware.h

diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/include/asm/arch-at91/io.h
similarity index 100%
rename from include/asm-arm/arch-at91/io.h
rename to arch/arm/include/asm/arch-at91/io.h

diff --git a/include/asm-arm/arch-at91/memory-map.h b/arch/arm/include/asm/arch-at91/memory-map.h
similarity index 100%
rename from include/asm-arm/arch-at91/memory-map.h
rename to arch/arm/include/asm/arch-at91/memory-map.h

diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
similarity index 100%
rename from include/asm-arm/arch-at91rm9200/AT91RM9200.h
rename to arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h

diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/include/asm/arch-at91rm9200/hardware.h
similarity index 100%
rename from include/asm-arm/arch-at91rm9200/hardware.h
rename to arch/arm/include/asm/arch-at91rm9200/hardware.h

diff --git a/include/asm-arm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h
similarity index 100%
rename from include/asm-arm/arch-davinci/emac_defs.h
rename to arch/arm/include/asm/arch-davinci/emac_defs.h

diff --git a/include/asm-arm/arch-davinci/emif_defs.h b/arch/arm/include/asm/arch-davinci/emif_defs.h
similarity index 100%
rename from include/asm-arm/arch-davinci/emif_defs.h
rename to arch/arm/include/asm/arch-davinci/emif_defs.h

diff --git a/include/asm-arm/arch-davinci/gpio_defs.h b/arch/arm/include/asm/arch-davinci/gpio_defs.h
similarity index 100%
rename from include/asm-arm/arch-davinci/gpio_defs.h
rename to arch/arm/include/asm/arch-davinci/gpio_defs.h

diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h
similarity index 100%
rename from include/asm-arm/arch-davinci/hardware.h
rename to arch/arm/include/asm/arch-davinci/hardware.h

diff --git a/include/asm-arm/arch-davinci/i2c_defs.h b/arch/arm/include/asm/arch-davinci/i2c_defs.h
similarity index 100%
rename from include/asm-arm/arch-davinci/i2c_defs.h
rename to arch/arm/include/asm/arch-davinci/i2c_defs.h

diff --git a/include/asm-arm/arch-davinci/nand_defs.h b/arch/arm/include/asm/arch-davinci/nand_defs.h
similarity index 100%
rename from include/asm-arm/arch-davinci/nand_defs.h
rename to arch/arm/include/asm/arch-davinci/nand_defs.h

diff --git a/include/asm-arm/arch-ep93xx/ep93xx.h b/arch/arm/include/asm/arch-ep93xx/ep93xx.h
similarity index 100%
rename from include/asm-arm/arch-ep93xx/ep93xx.h
rename to arch/arm/include/asm/arch-ep93xx/ep93xx.h

diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-imx/imx-regs.h
rename to arch/arm/include/asm/arch-imx/imx-regs.h

diff --git a/include/asm-arm/arch-ixp/ixp425.h b/arch/arm/include/asm/arch-ixp/ixp425.h
similarity index 100%
rename from include/asm-arm/arch-ixp/ixp425.h
rename to arch/arm/include/asm/arch-ixp/ixp425.h

diff --git a/include/asm-arm/arch-ixp/ixp425pci.h b/arch/arm/include/asm/arch-ixp/ixp425pci.h
similarity index 100%
rename from include/asm-arm/arch-ixp/ixp425pci.h
rename to arch/arm/include/asm/arch-ixp/ixp425pci.h

diff --git a/include/asm-arm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/cpu.h
rename to arch/arm/include/asm/arch-kirkwood/cpu.h

diff --git a/include/asm-arm/arch-kirkwood/gpio.h b/arch/arm/include/asm/arch-kirkwood/gpio.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/gpio.h
rename to arch/arm/include/asm/arch-kirkwood/gpio.h

diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kirkwood.h
rename to arch/arm/include/asm/arch-kirkwood/kirkwood.h

diff --git a/include/asm-arm/arch-kirkwood/kw88f6192.h b/arch/arm/include/asm/arch-kirkwood/kw88f6192.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kw88f6192.h
rename to arch/arm/include/asm/arch-kirkwood/kw88f6192.h

diff --git a/include/asm-arm/arch-kirkwood/kw88f6281.h b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kw88f6281.h
rename to arch/arm/include/asm/arch-kirkwood/kw88f6281.h

diff --git a/include/asm-arm/arch-kirkwood/mpp.h b/arch/arm/include/asm/arch-kirkwood/mpp.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/mpp.h
rename to arch/arm/include/asm/arch-kirkwood/mpp.h

diff --git a/include/asm-arm/arch-kirkwood/spi.h b/arch/arm/include/asm/arch-kirkwood/spi.h
similarity index 100%
rename from include/asm-arm/arch-kirkwood/spi.h
rename to arch/arm/include/asm/arch-kirkwood/spi.h

diff --git a/include/asm-arm/arch-ks8695/platform.h b/arch/arm/include/asm/arch-ks8695/platform.h
similarity index 100%
rename from include/asm-arm/arch-ks8695/platform.h
rename to arch/arm/include/asm/arch-ks8695/platform.h

diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/arch/arm/include/asm/arch-lpc2292/hardware.h
similarity index 100%
rename from include/asm-arm/arch-lpc2292/hardware.h
rename to arch/arm/include/asm/arch-lpc2292/hardware.h

diff --git a/include/asm-arm/arch-lpc2292/lpc2292_registers.h b/arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h
similarity index 100%
rename from include/asm-arm/arch-lpc2292/lpc2292_registers.h
rename to arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h

diff --git a/include/asm-arm/arch-lpc2292/spi.h b/arch/arm/include/asm/arch-lpc2292/spi.h
similarity index 100%
rename from include/asm-arm/arch-lpc2292/spi.h
rename to arch/arm/include/asm/arch-lpc2292/spi.h

diff --git a/include/asm-arm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h
similarity index 100%
rename from include/asm-arm/arch-mx25/clock.h
rename to arch/arm/include/asm/arch-mx25/clock.h

diff --git a/include/asm-arm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-mx25/imx-regs.h
rename to arch/arm/include/asm/arch-mx25/imx-regs.h

diff --git a/include/asm-arm/arch-mx25/imx25-pinmux.h b/arch/arm/include/asm/arch-mx25/imx25-pinmux.h
similarity index 100%
rename from include/asm-arm/arch-mx25/imx25-pinmux.h
rename to arch/arm/include/asm/arch-mx25/imx25-pinmux.h

diff --git a/include/asm-arm/arch-mx27/asm-offsets.h b/arch/arm/include/asm/arch-mx27/asm-offsets.h
similarity index 100%
rename from include/asm-arm/arch-mx27/asm-offsets.h
rename to arch/arm/include/asm/arch-mx27/asm-offsets.h

diff --git a/include/asm-arm/arch-mx27/clock.h b/arch/arm/include/asm/arch-mx27/clock.h
similarity index 100%
rename from include/asm-arm/arch-mx27/clock.h
rename to arch/arm/include/asm/arch-mx27/clock.h

diff --git a/include/asm-arm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-mx27/imx-regs.h
rename to arch/arm/include/asm/arch-mx27/imx-regs.h

diff --git a/include/asm-arm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h
similarity index 100%
rename from include/asm-arm/arch-mx27/mxcmmc.h
rename to arch/arm/include/asm/arch-mx27/mxcmmc.h

diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/arch/arm/include/asm/arch-mx31/mx31-regs.h
similarity index 100%
rename from include/asm-arm/arch-mx31/mx31-regs.h
rename to arch/arm/include/asm/arch-mx31/mx31-regs.h

diff --git a/include/asm-arm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h
similarity index 100%
rename from include/asm-arm/arch-mx31/mx31.h
rename to arch/arm/include/asm/arch-mx31/mx31.h

diff --git a/include/asm-arm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx51/asm-offsets.h
similarity index 100%
rename from include/asm-arm/arch-mx51/asm-offsets.h
rename to arch/arm/include/asm/arch-mx51/asm-offsets.h

diff --git a/include/asm-arm/arch-mx51/clock.h b/arch/arm/include/asm/arch-mx51/clock.h
similarity index 100%
rename from include/asm-arm/arch-mx51/clock.h
rename to arch/arm/include/asm/arch-mx51/clock.h

diff --git a/include/asm-arm/arch-mx51/crm_regs.h b/arch/arm/include/asm/arch-mx51/crm_regs.h
similarity index 100%
rename from include/asm-arm/arch-mx51/crm_regs.h
rename to arch/arm/include/asm/arch-mx51/crm_regs.h

diff --git a/include/asm-arm/arch-mx51/imx-regs.h b/arch/arm/include/asm/arch-mx51/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-mx51/imx-regs.h
rename to arch/arm/include/asm/arch-mx51/imx-regs.h

diff --git a/include/asm-arm/arch-mx51/iomux.h b/arch/arm/include/asm/arch-mx51/iomux.h
similarity index 100%
rename from include/asm-arm/arch-mx51/iomux.h
rename to arch/arm/include/asm/arch-mx51/iomux.h

diff --git a/include/asm-arm/arch-mx51/mx51_pins.h b/arch/arm/include/asm/arch-mx51/mx51_pins.h
similarity index 100%
rename from include/asm-arm/arch-mx51/mx51_pins.h
rename to arch/arm/include/asm/arch-mx51/mx51_pins.h

diff --git a/include/asm-arm/arch-mx51/sys_proto.h b/arch/arm/include/asm/arch-mx51/sys_proto.h
similarity index 100%
rename from include/asm-arm/arch-mx51/sys_proto.h
rename to arch/arm/include/asm/arch-mx51/sys_proto.h

diff --git a/include/asm-arm/arch-nomadik/gpio.h b/arch/arm/include/asm/arch-nomadik/gpio.h
similarity index 100%
rename from include/asm-arm/arch-nomadik/gpio.h
rename to arch/arm/include/asm/arch-nomadik/gpio.h

diff --git a/include/asm-arm/arch-nomadik/mtu.h b/arch/arm/include/asm/arch-nomadik/mtu.h
similarity index 100%
rename from include/asm-arm/arch-nomadik/mtu.h
rename to arch/arm/include/asm/arch-nomadik/mtu.h

diff --git a/include/asm-arm/arch-omap/sizes.h b/arch/arm/include/asm/arch-omap/sizes.h
similarity index 100%
rename from include/asm-arm/arch-omap/sizes.h
rename to arch/arm/include/asm/arch-omap/sizes.h

diff --git a/include/asm-arm/arch-omap24xx/bits.h b/arch/arm/include/asm/arch-omap24xx/bits.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/bits.h
rename to arch/arm/include/asm/arch-omap24xx/bits.h

diff --git a/include/asm-arm/arch-omap24xx/clocks.h b/arch/arm/include/asm/arch-omap24xx/clocks.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/clocks.h
rename to arch/arm/include/asm/arch-omap24xx/clocks.h

diff --git a/include/asm-arm/arch-omap24xx/i2c.h b/arch/arm/include/asm/arch-omap24xx/i2c.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/i2c.h
rename to arch/arm/include/asm/arch-omap24xx/i2c.h

diff --git a/include/asm-arm/arch-omap24xx/mem.h b/arch/arm/include/asm/arch-omap24xx/mem.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/mem.h
rename to arch/arm/include/asm/arch-omap24xx/mem.h

diff --git a/include/asm-arm/arch-omap24xx/mux.h b/arch/arm/include/asm/arch-omap24xx/mux.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/mux.h
rename to arch/arm/include/asm/arch-omap24xx/mux.h

diff --git a/include/asm-arm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/omap2420.h
rename to arch/arm/include/asm/arch-omap24xx/omap2420.h

diff --git a/include/asm-arm/arch-omap24xx/sizes.h b/arch/arm/include/asm/arch-omap24xx/sizes.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sizes.h
rename to arch/arm/include/asm/arch-omap24xx/sizes.h

diff --git a/include/asm-arm/arch-omap24xx/sys_info.h b/arch/arm/include/asm/arch-omap24xx/sys_info.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sys_info.h
rename to arch/arm/include/asm/arch-omap24xx/sys_info.h

diff --git a/include/asm-arm/arch-omap24xx/sys_proto.h b/arch/arm/include/asm/arch-omap24xx/sys_proto.h
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sys_proto.h
rename to arch/arm/include/asm/arch-omap24xx/sys_proto.h

diff --git a/include/asm-arm/arch-omap3/clocks.h b/arch/arm/include/asm/arch-omap3/clocks.h
similarity index 100%
rename from include/asm-arm/arch-omap3/clocks.h
rename to arch/arm/include/asm/arch-omap3/clocks.h

diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/arch/arm/include/asm/arch-omap3/clocks_omap3.h
similarity index 100%
rename from include/asm-arm/arch-omap3/clocks_omap3.h
rename to arch/arm/include/asm/arch-omap3/clocks_omap3.h

diff --git a/include/asm-arm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h
similarity index 100%
rename from include/asm-arm/arch-omap3/cpu.h
rename to arch/arm/include/asm/arch-omap3/cpu.h

diff --git a/include/asm-arm/arch-omap3/gpio.h b/arch/arm/include/asm/arch-omap3/gpio.h
similarity index 100%
rename from include/asm-arm/arch-omap3/gpio.h
rename to arch/arm/include/asm/arch-omap3/gpio.h

diff --git a/include/asm-arm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h
similarity index 100%
rename from include/asm-arm/arch-omap3/i2c.h
rename to arch/arm/include/asm/arch-omap3/i2c.h

diff --git a/include/asm-arm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h
similarity index 100%
rename from include/asm-arm/arch-omap3/mem.h
rename to arch/arm/include/asm/arch-omap3/mem.h

diff --git a/include/asm-arm/arch-omap3/mmc.h b/arch/arm/include/asm/arch-omap3/mmc.h
similarity index 100%
rename from include/asm-arm/arch-omap3/mmc.h
rename to arch/arm/include/asm/arch-omap3/mmc.h

diff --git a/include/asm-arm/arch-omap3/mmc_host_def.h b/arch/arm/include/asm/arch-omap3/mmc_host_def.h
similarity index 100%
rename from include/asm-arm/arch-omap3/mmc_host_def.h
rename to arch/arm/include/asm/arch-omap3/mmc_host_def.h

diff --git a/include/asm-arm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
similarity index 100%
rename from include/asm-arm/arch-omap3/mux.h
rename to arch/arm/include/asm/arch-omap3/mux.h

diff --git a/include/asm-arm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h
similarity index 100%
rename from include/asm-arm/arch-omap3/omap3.h
rename to arch/arm/include/asm/arch-omap3/omap3.h

diff --git a/include/asm-arm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h
similarity index 100%
rename from include/asm-arm/arch-omap3/omap_gpmc.h
rename to arch/arm/include/asm/arch-omap3/omap_gpmc.h

diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
similarity index 100%
rename from include/asm-arm/arch-omap3/sys_proto.h
rename to arch/arm/include/asm/arch-omap3/sys_proto.h

diff --git a/include/asm-arm/arch-pxa/bitfield.h b/arch/arm/include/asm/arch-pxa/bitfield.h
similarity index 100%
rename from include/asm-arm/arch-pxa/bitfield.h
rename to arch/arm/include/asm/arch-pxa/bitfield.h

diff --git a/include/asm-arm/arch-pxa/hardware.h b/arch/arm/include/asm/arch-pxa/hardware.h
similarity index 100%
rename from include/asm-arm/arch-pxa/hardware.h
rename to arch/arm/include/asm/arch-pxa/hardware.h

diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/arch/arm/include/asm/arch-pxa/pxa-regs.h
similarity index 100%
rename from include/asm-arm/arch-pxa/pxa-regs.h
rename to arch/arm/include/asm/arch-pxa/pxa-regs.h

diff --git a/include/asm-arm/arch-s3c24x0/memory.h b/arch/arm/include/asm/arch-s3c24x0/memory.h
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/memory.h
rename to arch/arm/include/asm/arch-s3c24x0/memory.h

diff --git a/include/asm-arm/arch-s3c24x0/s3c2400.h b/arch/arm/include/asm/arch-s3c24x0/s3c2400.h
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c2400.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c2400.h

diff --git a/include/asm-arm/arch-s3c24x0/s3c2410.h b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c2410.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c2410.h

diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c24x0.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0.h

diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h

diff --git a/include/asm-arm/arch-s3c44b0/hardware.h b/arch/arm/include/asm/arch-s3c44b0/hardware.h
similarity index 100%
rename from include/asm-arm/arch-s3c44b0/hardware.h
rename to arch/arm/include/asm/arch-s3c44b0/hardware.h

diff --git a/include/asm-arm/arch-s3c4510b/hardware.h b/arch/arm/include/asm/arch-s3c4510b/hardware.h
similarity index 100%
rename from include/asm-arm/arch-s3c4510b/hardware.h
rename to arch/arm/include/asm/arch-s3c4510b/hardware.h

diff --git a/include/asm-arm/arch-s3c64xx/hardware.h b/arch/arm/include/asm/arch-s3c64xx/hardware.h
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/hardware.h
rename to arch/arm/include/asm/arch-s3c64xx/hardware.h

diff --git a/include/asm-arm/arch-s3c64xx/s3c6400.h b/arch/arm/include/asm/arch-s3c64xx/s3c6400.h
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/s3c6400.h
rename to arch/arm/include/asm/arch-s3c64xx/s3c6400.h

diff --git a/include/asm-arm/arch-s3c64xx/s3c64x0.h b/arch/arm/include/asm/arch-s3c64xx/s3c64x0.h
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/s3c64x0.h
rename to arch/arm/include/asm/arch-s3c64xx/s3c64x0.h

diff --git a/include/asm-arm/arch-s5pc1xx/clk.h b/arch/arm/include/asm/arch-s5pc1xx/clk.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/clk.h
rename to arch/arm/include/asm/arch-s5pc1xx/clk.h

diff --git a/include/asm-arm/arch-s5pc1xx/clock.h b/arch/arm/include/asm/arch-s5pc1xx/clock.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/clock.h
rename to arch/arm/include/asm/arch-s5pc1xx/clock.h

diff --git a/include/asm-arm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/cpu.h
rename to arch/arm/include/asm/arch-s5pc1xx/cpu.h

diff --git a/include/asm-arm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/gpio.h
rename to arch/arm/include/asm/arch-s5pc1xx/gpio.h

diff --git a/include/asm-arm/arch-s5pc1xx/power.h b/arch/arm/include/asm/arch-s5pc1xx/power.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/power.h
rename to arch/arm/include/asm/arch-s5pc1xx/power.h

diff --git a/include/asm-arm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/pwm.h
rename to arch/arm/include/asm/arch-s5pc1xx/pwm.h

diff --git a/include/asm-arm/arch-s5pc1xx/smc.h b/arch/arm/include/asm/arch-s5pc1xx/smc.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/smc.h
rename to arch/arm/include/asm/arch-s5pc1xx/smc.h

diff --git a/include/asm-arm/arch-s5pc1xx/sys_proto.h b/arch/arm/include/asm/arch-s5pc1xx/sys_proto.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/sys_proto.h
rename to arch/arm/include/asm/arch-s5pc1xx/sys_proto.h

diff --git a/include/asm-arm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/uart.h
rename to arch/arm/include/asm/arch-s5pc1xx/uart.h

diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/arch/arm/include/asm/arch-sa1100/bitfield.h
similarity index 100%
rename from include/asm-arm/arch-sa1100/bitfield.h
rename to arch/arm/include/asm/arch-sa1100/bitfield.h

diff --git a/include/asm-arm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h
similarity index 100%
rename from include/asm-arm/arch-spear/hardware.h
rename to arch/arm/include/asm/arch-spear/hardware.h

diff --git a/include/asm-arm/arch-spear/spr_defs.h b/arch/arm/include/asm/arch-spear/spr_defs.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_defs.h
rename to arch/arm/include/asm/arch-spear/spr_defs.h

diff --git a/include/asm-arm/arch-spear/spr_emi.h b/arch/arm/include/asm/arch-spear/spr_emi.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_emi.h
rename to arch/arm/include/asm/arch-spear/spr_emi.h

diff --git a/include/asm-arm/arch-spear/spr_gpt.h b/arch/arm/include/asm/arch-spear/spr_gpt.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_gpt.h
rename to arch/arm/include/asm/arch-spear/spr_gpt.h

diff --git a/include/asm-arm/arch-spear/spr_i2c.h b/arch/arm/include/asm/arch-spear/spr_i2c.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_i2c.h
rename to arch/arm/include/asm/arch-spear/spr_i2c.h

diff --git a/include/asm-arm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_misc.h
rename to arch/arm/include/asm/arch-spear/spr_misc.h

diff --git a/include/asm-arm/arch-spear/spr_nand.h b/arch/arm/include/asm/arch-spear/spr_nand.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_nand.h
rename to arch/arm/include/asm/arch-spear/spr_nand.h

diff --git a/include/asm-arm/arch-spear/spr_smi.h b/arch/arm/include/asm/arch-spear/spr_smi.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_smi.h
rename to arch/arm/include/asm/arch-spear/spr_smi.h

diff --git a/include/asm-arm/arch-spear/spr_syscntl.h b/arch/arm/include/asm/arch-spear/spr_syscntl.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_syscntl.h
rename to arch/arm/include/asm/arch-spear/spr_syscntl.h

diff --git a/include/asm-arm/arch-spear/spr_xloader_table.h b/arch/arm/include/asm/arch-spear/spr_xloader_table.h
similarity index 100%
rename from include/asm-arm/arch-spear/spr_xloader_table.h
rename to arch/arm/include/asm/arch-spear/spr_xloader_table.h

diff --git a/include/asm-arm/atomic.h b/arch/arm/include/asm/atomic.h
similarity index 100%
rename from include/asm-arm/atomic.h
rename to arch/arm/include/asm/atomic.h

diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h
similarity index 100%
rename from include/asm-arm/bitops.h
rename to arch/arm/include/asm/bitops.h

diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h
similarity index 100%
rename from include/asm-arm/byteorder.h
rename to arch/arm/include/asm/byteorder.h

diff --git a/include/asm-arm/cache.h b/arch/arm/include/asm/cache.h
similarity index 100%
rename from include/asm-arm/cache.h
rename to arch/arm/include/asm/cache.h

diff --git a/include/asm-arm/config.h b/arch/arm/include/asm/config.h
similarity index 100%
rename from include/asm-arm/config.h
rename to arch/arm/include/asm/config.h

diff --git a/include/asm-arm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-arm/dma-mapping.h
rename to arch/arm/include/asm/dma-mapping.h

diff --git a/include/asm-arm/errno.h b/arch/arm/include/asm/errno.h
similarity index 100%
rename from include/asm-arm/errno.h
rename to arch/arm/include/asm/errno.h

diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h
similarity index 100%
rename from include/asm-arm/global_data.h
rename to arch/arm/include/asm/global_data.h

diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h
similarity index 100%
rename from include/asm-arm/hardware.h
rename to arch/arm/include/asm/hardware.h

diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h
similarity index 100%
rename from include/asm-arm/io.h
rename to arch/arm/include/asm/io.h

diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h
similarity index 100%
rename from include/asm-arm/mach-types.h
rename to arch/arm/include/asm/mach-types.h

diff --git a/include/asm-arm/macro.h b/arch/arm/include/asm/macro.h
similarity index 100%
rename from include/asm-arm/macro.h
rename to arch/arm/include/asm/macro.h

diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h
similarity index 100%
rename from include/asm-arm/memory.h
rename to arch/arm/include/asm/memory.h

diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h
similarity index 100%
rename from include/asm-arm/posix_types.h
rename to arch/arm/include/asm/posix_types.h

diff --git a/include/asm-arm/proc-armv/domain.h b/arch/arm/include/asm/proc-armv/domain.h
similarity index 100%
rename from include/asm-arm/proc-armv/domain.h
rename to arch/arm/include/asm/proc-armv/domain.h

diff --git a/include/asm-arm/proc-armv/processor.h b/arch/arm/include/asm/proc-armv/processor.h
similarity index 100%
rename from include/asm-arm/proc-armv/processor.h
rename to arch/arm/include/asm/proc-armv/processor.h

diff --git a/include/asm-arm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h
similarity index 100%
rename from include/asm-arm/proc-armv/ptrace.h
rename to arch/arm/include/asm/proc-armv/ptrace.h

diff --git a/include/asm-arm/proc-armv/system.h b/arch/arm/include/asm/proc-armv/system.h
similarity index 100%
rename from include/asm-arm/proc-armv/system.h
rename to arch/arm/include/asm/proc-armv/system.h

diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h
similarity index 100%
rename from include/asm-arm/processor.h
rename to arch/arm/include/asm/processor.h

diff --git a/include/asm-arm/ptrace.h b/arch/arm/include/asm/ptrace.h
similarity index 100%
rename from include/asm-arm/ptrace.h
rename to arch/arm/include/asm/ptrace.h

diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h
similarity index 100%
rename from include/asm-arm/setup.h
rename to arch/arm/include/asm/setup.h

diff --git a/include/asm-arm/sizes.h b/arch/arm/include/asm/sizes.h
similarity index 100%
rename from include/asm-arm/sizes.h
rename to arch/arm/include/asm/sizes.h

diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h
similarity index 100%
rename from include/asm-arm/string.h
rename to arch/arm/include/asm/string.h

diff --git a/include/asm-arm/system.h b/arch/arm/include/asm/system.h
similarity index 100%
rename from include/asm-arm/system.h
rename to arch/arm/include/asm/system.h

diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h
similarity index 100%
rename from include/asm-arm/types.h
rename to arch/arm/include/asm/types.h

diff --git a/include/asm-arm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
similarity index 100%
rename from include/asm-arm/u-boot-arm.h
rename to arch/arm/include/asm/u-boot-arm.h

diff --git a/include/asm-arm/u-boot.h b/arch/arm/include/asm/u-boot.h
similarity index 100%
rename from include/asm-arm/u-boot.h
rename to arch/arm/include/asm/u-boot.h

diff --git a/include/asm-arm/unaligned.h b/arch/arm/include/asm/unaligned.h
similarity index 100%
rename from include/asm-arm/unaligned.h
rename to arch/arm/include/asm/unaligned.h

diff --git a/include/asm-avr32/arch-at32ap700x/addrspace.h b/arch/avr32/include/asm/arch-at32ap700x/addrspace.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/addrspace.h
rename to arch/avr32/include/asm/arch-at32ap700x/addrspace.h

diff --git a/include/asm-avr32/arch-at32ap700x/cacheflush.h b/arch/avr32/include/asm/arch-at32ap700x/cacheflush.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/cacheflush.h
rename to arch/avr32/include/asm/arch-at32ap700x/cacheflush.h

diff --git a/include/asm-avr32/arch-at32ap700x/chip-features.h b/arch/avr32/include/asm/arch-at32ap700x/chip-features.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/chip-features.h
rename to arch/avr32/include/asm/arch-at32ap700x/chip-features.h

diff --git a/include/asm-avr32/arch-at32ap700x/clk.h b/arch/avr32/include/asm/arch-at32ap700x/clk.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/clk.h
rename to arch/avr32/include/asm/arch-at32ap700x/clk.h

diff --git a/include/asm-avr32/arch-at32ap700x/gpio-impl.h b/arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/gpio-impl.h
rename to arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h

diff --git a/include/asm-avr32/arch-at32ap700x/gpio.h b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/gpio.h
rename to arch/avr32/include/asm/arch-at32ap700x/gpio.h

diff --git a/include/asm-avr32/arch-at32ap700x/hmatrix.h b/arch/avr32/include/asm/arch-at32ap700x/hmatrix.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/hmatrix.h
rename to arch/avr32/include/asm/arch-at32ap700x/hmatrix.h

diff --git a/include/asm-avr32/arch-at32ap700x/memory-map.h b/arch/avr32/include/asm/arch-at32ap700x/memory-map.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/memory-map.h
rename to arch/avr32/include/asm/arch-at32ap700x/memory-map.h

diff --git a/include/asm-avr32/arch-at32ap700x/portmux.h b/arch/avr32/include/asm/arch-at32ap700x/portmux.h
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/portmux.h
rename to arch/avr32/include/asm/arch-at32ap700x/portmux.h

diff --git a/include/asm-avr32/arch-common/portmux-gpio.h b/arch/avr32/include/asm/arch-common/portmux-gpio.h
similarity index 100%
rename from include/asm-avr32/arch-common/portmux-gpio.h
rename to arch/avr32/include/asm/arch-common/portmux-gpio.h

diff --git a/include/asm-avr32/arch-common/portmux-pio.h b/arch/avr32/include/asm/arch-common/portmux-pio.h
similarity index 100%
rename from include/asm-avr32/arch-common/portmux-pio.h
rename to arch/avr32/include/asm/arch-common/portmux-pio.h

diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h
similarity index 100%
rename from include/asm-avr32/bitops.h
rename to arch/avr32/include/asm/bitops.h

diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h
similarity index 100%
rename from include/asm-avr32/byteorder.h
rename to arch/avr32/include/asm/byteorder.h

diff --git a/include/asm-avr32/config.h b/arch/avr32/include/asm/config.h
similarity index 100%
rename from include/asm-avr32/config.h
rename to arch/avr32/include/asm/config.h

diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-avr32/dma-mapping.h
rename to arch/avr32/include/asm/dma-mapping.h

diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h
similarity index 100%
rename from include/asm-avr32/errno.h
rename to arch/avr32/include/asm/errno.h

diff --git a/include/asm-avr32/global_data.h b/arch/avr32/include/asm/global_data.h
similarity index 100%
rename from include/asm-avr32/global_data.h
rename to arch/avr32/include/asm/global_data.h

diff --git a/include/asm-avr32/hmatrix-common.h b/arch/avr32/include/asm/hmatrix-common.h
similarity index 100%
rename from include/asm-avr32/hmatrix-common.h
rename to arch/avr32/include/asm/hmatrix-common.h

diff --git a/include/asm-avr32/initcalls.h b/arch/avr32/include/asm/initcalls.h
similarity index 100%
rename from include/asm-avr32/initcalls.h
rename to arch/avr32/include/asm/initcalls.h

diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h
similarity index 100%
rename from include/asm-avr32/io.h
rename to arch/avr32/include/asm/io.h

diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h
similarity index 100%
rename from include/asm-avr32/posix_types.h
rename to arch/avr32/include/asm/posix_types.h

diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h
similarity index 100%
rename from include/asm-avr32/processor.h
rename to arch/avr32/include/asm/processor.h

diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h
similarity index 100%
rename from include/asm-avr32/ptrace.h
rename to arch/avr32/include/asm/ptrace.h

diff --git a/include/asm-avr32/sdram.h b/arch/avr32/include/asm/sdram.h
similarity index 100%
rename from include/asm-avr32/sdram.h
rename to arch/avr32/include/asm/sdram.h

diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h
similarity index 100%
rename from include/asm-avr32/sections.h
rename to arch/avr32/include/asm/sections.h

diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h
similarity index 100%
rename from include/asm-avr32/setup.h
rename to arch/avr32/include/asm/setup.h

diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h
similarity index 100%
rename from include/asm-avr32/string.h
rename to arch/avr32/include/asm/string.h

diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h
similarity index 100%
rename from include/asm-avr32/sysreg.h
rename to arch/avr32/include/asm/sysreg.h

diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h
similarity index 100%
rename from include/asm-avr32/types.h
rename to arch/avr32/include/asm/types.h

diff --git a/include/asm-avr32/u-boot.h b/arch/avr32/include/asm/u-boot.h
similarity index 100%
rename from include/asm-avr32/u-boot.h
rename to arch/avr32/include/asm/u-boot.h

diff --git a/include/asm-blackfin/bfin_logo_230x230.h b/arch/blackfin/include/asm/bfin_logo_230x230.h
similarity index 100%
rename from include/asm-blackfin/bfin_logo_230x230.h
rename to arch/blackfin/include/asm/bfin_logo_230x230.h

diff --git a/include/asm-blackfin/bfin_logo_rgb565_230x230.h b/arch/blackfin/include/asm/bfin_logo_rgb565_230x230.h
similarity index 100%
rename from include/asm-blackfin/bfin_logo_rgb565_230x230.h
rename to arch/blackfin/include/asm/bfin_logo_rgb565_230x230.h

diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h
similarity index 100%
rename from include/asm-blackfin/bitops.h
rename to arch/blackfin/include/asm/bitops.h

diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h
similarity index 100%
rename from include/asm-blackfin/blackfin.h
rename to arch/blackfin/include/asm/blackfin.h

diff --git a/include/asm-blackfin/blackfin_cdef.h b/arch/blackfin/include/asm/blackfin_cdef.h
similarity index 100%
rename from include/asm-blackfin/blackfin_cdef.h
rename to arch/blackfin/include/asm/blackfin_cdef.h

diff --git a/include/asm-blackfin/blackfin_def.h b/arch/blackfin/include/asm/blackfin_def.h
similarity index 100%
rename from include/asm-blackfin/blackfin_def.h
rename to arch/blackfin/include/asm/blackfin_def.h

diff --git a/include/asm-blackfin/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h
similarity index 100%
rename from include/asm-blackfin/blackfin_local.h
rename to arch/blackfin/include/asm/blackfin_local.h

diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h
similarity index 100%
rename from include/asm-blackfin/byteorder.h
rename to arch/blackfin/include/asm/byteorder.h

diff --git a/include/asm-blackfin/config-pre.h b/arch/blackfin/include/asm/config-pre.h
similarity index 100%
rename from include/asm-blackfin/config-pre.h
rename to arch/blackfin/include/asm/config-pre.h

diff --git a/include/asm-blackfin/config.h b/arch/blackfin/include/asm/config.h
similarity index 100%
rename from include/asm-blackfin/config.h
rename to arch/blackfin/include/asm/config.h

diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h
similarity index 100%
rename from include/asm-blackfin/cplb.h
rename to arch/blackfin/include/asm/cplb.h

diff --git a/include/asm-blackfin/deferred.h b/arch/blackfin/include/asm/deferred.h
similarity index 100%
rename from include/asm-blackfin/deferred.h
rename to arch/blackfin/include/asm/deferred.h

diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h
similarity index 100%
rename from include/asm-blackfin/delay.h
rename to arch/blackfin/include/asm/delay.h

diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h
similarity index 100%
rename from include/asm-blackfin/entry.h
rename to arch/blackfin/include/asm/entry.h

diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h
similarity index 100%
rename from include/asm-blackfin/errno.h
rename to arch/blackfin/include/asm/errno.h

diff --git a/include/asm-blackfin/global_data.h b/arch/blackfin/include/asm/global_data.h
similarity index 100%
rename from include/asm-blackfin/global_data.h
rename to arch/blackfin/include/asm/global_data.h

diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h
similarity index 100%
rename from include/asm-blackfin/io.h
rename to arch/blackfin/include/asm/io.h

diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h
similarity index 100%
rename from include/asm-blackfin/linkage.h
rename to arch/blackfin/include/asm/linkage.h

diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h
rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF522_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF522_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF522_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF522_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF522_def.h b/arch/blackfin/include/asm/mach-bf527/BF522_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF522_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF522_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF523_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF523_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF523_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF523_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF523_def.h b/arch/blackfin/include/asm/mach-bf527/BF523_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF523_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF523_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF524_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF524_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF524_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF524_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF524_def.h b/arch/blackfin/include/asm/mach-bf527/BF524_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF524_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF524_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF525_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF525_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF525_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF525_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF525_def.h b/arch/blackfin/include/asm/mach-bf527/BF525_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF525_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF525_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF526_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF526_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF526_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF526_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF526_def.h b/arch/blackfin/include/asm/mach-bf527/BF526_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF526_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF526_def.h

diff --git a/include/asm-blackfin/mach-bf527/BF527_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF527_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF527_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF527_cdef.h

diff --git a/include/asm-blackfin/mach-bf527/BF527_def.h b/arch/blackfin/include/asm/mach-bf527/BF527_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF527_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF527_def.h

diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/include/asm/mach-bf527/anomaly.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/anomaly.h
rename to arch/blackfin/include/asm/mach-bf527/anomaly.h

diff --git a/include/asm-blackfin/mach-bf527/def_local.h b/arch/blackfin/include/asm/mach-bf527/def_local.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/def_local.h
rename to arch/blackfin/include/asm/mach-bf527/def_local.h

diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/include/asm/mach-bf527/mem_map.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/mem_map.h
rename to arch/blackfin/include/asm/mach-bf527/mem_map.h

diff --git a/include/asm-blackfin/mach-bf527/ports.h b/arch/blackfin/include/asm/mach-bf527/ports.h
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ports.h
rename to arch/blackfin/include/asm/mach-bf527/ports.h

diff --git a/include/asm-blackfin/mach-bf533/BF531_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF531_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF531_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF531_cdef.h

diff --git a/include/asm-blackfin/mach-bf533/BF531_def.h b/arch/blackfin/include/asm/mach-bf533/BF531_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF531_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF531_def.h

diff --git a/include/asm-blackfin/mach-bf533/BF532_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF532_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF532_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF532_cdef.h

diff --git a/include/asm-blackfin/mach-bf533/BF532_def.h b/arch/blackfin/include/asm/mach-bf533/BF532_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF532_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF532_def.h

diff --git a/include/asm-blackfin/mach-bf533/BF533_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF533_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF533_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF533_cdef.h

diff --git a/include/asm-blackfin/mach-bf533/BF533_def.h b/arch/blackfin/include/asm/mach-bf533/BF533_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF533_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF533_def.h

diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/include/asm/mach-bf533/anomaly.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/anomaly.h
rename to arch/blackfin/include/asm/mach-bf533/anomaly.h

diff --git a/include/asm-blackfin/mach-bf533/def_local.h b/arch/blackfin/include/asm/mach-bf533/def_local.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/def_local.h
rename to arch/blackfin/include/asm/mach-bf533/def_local.h

diff --git a/include/asm-blackfin/mach-bf533/ports.h b/arch/blackfin/include/asm/mach-bf533/ports.h
similarity index 100%
rename from include/asm-blackfin/mach-bf533/ports.h
rename to arch/blackfin/include/asm/mach-bf533/ports.h

diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h
rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h

diff --git a/include/asm-blackfin/mach-bf537/BF534_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF534_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF534_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF534_cdef.h

diff --git a/include/asm-blackfin/mach-bf537/BF534_def.h b/arch/blackfin/include/asm/mach-bf537/BF534_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF534_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF534_def.h

diff --git a/include/asm-blackfin/mach-bf537/BF536_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF536_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF536_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF536_cdef.h

diff --git a/include/asm-blackfin/mach-bf537/BF536_def.h b/arch/blackfin/include/asm/mach-bf537/BF536_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF536_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF536_def.h

diff --git a/include/asm-blackfin/mach-bf537/BF537_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF537_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF537_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF537_cdef.h

diff --git a/include/asm-blackfin/mach-bf537/BF537_def.h b/arch/blackfin/include/asm/mach-bf537/BF537_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF537_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF537_def.h

diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/include/asm/mach-bf537/anomaly.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/anomaly.h
rename to arch/blackfin/include/asm/mach-bf537/anomaly.h

diff --git a/include/asm-blackfin/mach-bf537/def_local.h b/arch/blackfin/include/asm/mach-bf537/def_local.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/def_local.h
rename to arch/blackfin/include/asm/mach-bf537/def_local.h

diff --git a/include/asm-blackfin/mach-bf537/ports.h b/arch/blackfin/include/asm/mach-bf537/ports.h
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ports.h
rename to arch/blackfin/include/asm/mach-bf537/ports.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF541_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF541_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF541_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF541_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF541_def.h b/arch/blackfin/include/asm/mach-bf548/BF541_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF541_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF541_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF542_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF542_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF542_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF542_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF542_def.h b/arch/blackfin/include/asm/mach-bf548/BF542_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF542_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF542_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF544_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF544_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF544_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF544_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF544_def.h b/arch/blackfin/include/asm/mach-bf548/BF544_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF544_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF544_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF547_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF547_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF547_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF547_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF547_def.h b/arch/blackfin/include/asm/mach-bf548/BF547_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF547_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF547_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF548_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF548_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF548_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF548_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF548_def.h b/arch/blackfin/include/asm/mach-bf548/BF548_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF548_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF548_def.h

diff --git a/include/asm-blackfin/mach-bf548/BF549_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF549_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF549_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF549_cdef.h

diff --git a/include/asm-blackfin/mach-bf548/BF549_def.h b/arch/blackfin/include/asm/mach-bf548/BF549_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF549_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF549_def.h

diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/include/asm/mach-bf548/anomaly.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/anomaly.h
rename to arch/blackfin/include/asm/mach-bf548/anomaly.h

diff --git a/include/asm-blackfin/mach-bf548/def_local.h b/arch/blackfin/include/asm/mach-bf548/def_local.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/def_local.h
rename to arch/blackfin/include/asm/mach-bf548/def_local.h

diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/include/asm/mach-bf548/mem_map.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/mem_map.h
rename to arch/blackfin/include/asm/mach-bf548/mem_map.h

diff --git a/include/asm-blackfin/mach-bf548/ports.h b/arch/blackfin/include/asm/mach-bf548/ports.h
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ports.h
rename to arch/blackfin/include/asm/mach-bf548/ports.h

diff --git a/include/asm-blackfin/mach-bf561/BF561_cdef.h b/arch/blackfin/include/asm/mach-bf561/BF561_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-bf561/BF561_cdef.h
rename to arch/blackfin/include/asm/mach-bf561/BF561_cdef.h

diff --git a/include/asm-blackfin/mach-bf561/BF561_def.h b/arch/blackfin/include/asm/mach-bf561/BF561_def.h
similarity index 100%
rename from include/asm-blackfin/mach-bf561/BF561_def.h
rename to arch/blackfin/include/asm/mach-bf561/BF561_def.h

diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/include/asm/mach-bf561/anomaly.h
similarity index 100%
rename from include/asm-blackfin/mach-bf561/anomaly.h
rename to arch/blackfin/include/asm/mach-bf561/anomaly.h

diff --git a/include/asm-blackfin/mach-bf561/def_local.h b/arch/blackfin/include/asm/mach-bf561/def_local.h
similarity index 100%
rename from include/asm-blackfin/mach-bf561/def_local.h
rename to arch/blackfin/include/asm/mach-bf561/def_local.h

diff --git a/include/asm-blackfin/mach-bf561/ports.h b/arch/blackfin/include/asm/mach-bf561/ports.h
similarity index 100%
rename from include/asm-blackfin/mach-bf561/ports.h
rename to arch/blackfin/include/asm/mach-bf561/ports.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-core_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h

diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h

diff --git a/include/asm-blackfin/mach-common/bits/bootrom.h b/arch/blackfin/include/asm/mach-common/bits/bootrom.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/bootrom.h
rename to arch/blackfin/include/asm/mach-common/bits/bootrom.h

diff --git a/include/asm-blackfin/mach-common/bits/core.h b/arch/blackfin/include/asm/mach-common/bits/core.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/core.h
rename to arch/blackfin/include/asm/mach-common/bits/core.h

diff --git a/include/asm-blackfin/mach-common/bits/dma.h b/arch/blackfin/include/asm/mach-common/bits/dma.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/dma.h
rename to arch/blackfin/include/asm/mach-common/bits/dma.h

diff --git a/include/asm-blackfin/mach-common/bits/ebiu.h b/arch/blackfin/include/asm/mach-common/bits/ebiu.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ebiu.h
rename to arch/blackfin/include/asm/mach-common/bits/ebiu.h

diff --git a/include/asm-blackfin/mach-common/bits/emac.h b/arch/blackfin/include/asm/mach-common/bits/emac.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/emac.h
rename to arch/blackfin/include/asm/mach-common/bits/emac.h

diff --git a/include/asm-blackfin/mach-common/bits/eppi.h b/arch/blackfin/include/asm/mach-common/bits/eppi.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/eppi.h
rename to arch/blackfin/include/asm/mach-common/bits/eppi.h

diff --git a/include/asm-blackfin/mach-common/bits/lockbox.h b/arch/blackfin/include/asm/mach-common/bits/lockbox.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/lockbox.h
rename to arch/blackfin/include/asm/mach-common/bits/lockbox.h

diff --git a/include/asm-blackfin/mach-common/bits/mpu.h b/arch/blackfin/include/asm/mach-common/bits/mpu.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/mpu.h
rename to arch/blackfin/include/asm/mach-common/bits/mpu.h

diff --git a/include/asm-blackfin/mach-common/bits/otp.h b/arch/blackfin/include/asm/mach-common/bits/otp.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/otp.h
rename to arch/blackfin/include/asm/mach-common/bits/otp.h

diff --git a/include/asm-blackfin/mach-common/bits/pata.h b/arch/blackfin/include/asm/mach-common/bits/pata.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/pata.h
rename to arch/blackfin/include/asm/mach-common/bits/pata.h

diff --git a/include/asm-blackfin/mach-common/bits/pll.h b/arch/blackfin/include/asm/mach-common/bits/pll.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/pll.h
rename to arch/blackfin/include/asm/mach-common/bits/pll.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-a.h b/arch/blackfin/include/asm/mach-common/bits/ports-a.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-a.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-a.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-b.h b/arch/blackfin/include/asm/mach-common/bits/ports-b.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-b.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-b.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-c.h b/arch/blackfin/include/asm/mach-common/bits/ports-c.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-c.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-c.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-d.h b/arch/blackfin/include/asm/mach-common/bits/ports-d.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-d.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-d.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-e.h b/arch/blackfin/include/asm/mach-common/bits/ports-e.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-e.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-e.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-f.h b/arch/blackfin/include/asm/mach-common/bits/ports-f.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-f.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-f.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-g.h b/arch/blackfin/include/asm/mach-common/bits/ports-g.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-g.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-g.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-h.h b/arch/blackfin/include/asm/mach-common/bits/ports-h.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-h.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-h.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-i.h b/arch/blackfin/include/asm/mach-common/bits/ports-i.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-i.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-i.h

diff --git a/include/asm-blackfin/mach-common/bits/ports-j.h b/arch/blackfin/include/asm/mach-common/bits/ports-j.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-j.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-j.h

diff --git a/include/asm-blackfin/mach-common/bits/ppi.h b/arch/blackfin/include/asm/mach-common/bits/ppi.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ppi.h
rename to arch/blackfin/include/asm/mach-common/bits/ppi.h

diff --git a/include/asm-blackfin/mach-common/bits/rtc.h b/arch/blackfin/include/asm/mach-common/bits/rtc.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/rtc.h
rename to arch/blackfin/include/asm/mach-common/bits/rtc.h

diff --git a/include/asm-blackfin/mach-common/bits/sdh.h b/arch/blackfin/include/asm/mach-common/bits/sdh.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/sdh.h
rename to arch/blackfin/include/asm/mach-common/bits/sdh.h

diff --git a/include/asm-blackfin/mach-common/bits/spi.h b/arch/blackfin/include/asm/mach-common/bits/spi.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/spi.h
rename to arch/blackfin/include/asm/mach-common/bits/spi.h

diff --git a/include/asm-blackfin/mach-common/bits/sport.h b/arch/blackfin/include/asm/mach-common/bits/sport.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/sport.h
rename to arch/blackfin/include/asm/mach-common/bits/sport.h

diff --git a/include/asm-blackfin/mach-common/bits/timer.h b/arch/blackfin/include/asm/mach-common/bits/timer.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/timer.h
rename to arch/blackfin/include/asm/mach-common/bits/timer.h

diff --git a/include/asm-blackfin/mach-common/bits/trace.h b/arch/blackfin/include/asm/mach-common/bits/trace.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/trace.h
rename to arch/blackfin/include/asm/mach-common/bits/trace.h

diff --git a/include/asm-blackfin/mach-common/bits/twi.h b/arch/blackfin/include/asm/mach-common/bits/twi.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/twi.h
rename to arch/blackfin/include/asm/mach-common/bits/twi.h

diff --git a/include/asm-blackfin/mach-common/bits/uart.h b/arch/blackfin/include/asm/mach-common/bits/uart.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/uart.h
rename to arch/blackfin/include/asm/mach-common/bits/uart.h

diff --git a/include/asm-blackfin/mach-common/bits/usb.h b/arch/blackfin/include/asm/mach-common/bits/usb.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/usb.h
rename to arch/blackfin/include/asm/mach-common/bits/usb.h

diff --git a/include/asm-blackfin/mach-common/bits/watchdog.h b/arch/blackfin/include/asm/mach-common/bits/watchdog.h
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/watchdog.h
rename to arch/blackfin/include/asm/mach-common/bits/watchdog.h

diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h
similarity index 100%
rename from include/asm-blackfin/mem_map.h
rename to arch/blackfin/include/asm/mem_map.h

diff --git a/include/asm-blackfin/net.h b/arch/blackfin/include/asm/net.h
similarity index 100%
rename from include/asm-blackfin/net.h
rename to arch/blackfin/include/asm/net.h

diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h
similarity index 100%
rename from include/asm-blackfin/posix_types.h
rename to arch/blackfin/include/asm/posix_types.h

diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h
similarity index 100%
rename from include/asm-blackfin/processor.h
rename to arch/blackfin/include/asm/processor.h

diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h
similarity index 100%
rename from include/asm-blackfin/ptrace.h
rename to arch/blackfin/include/asm/ptrace.h

diff --git a/include/asm-blackfin/sdh.h b/arch/blackfin/include/asm/sdh.h
similarity index 100%
rename from include/asm-blackfin/sdh.h
rename to arch/blackfin/include/asm/sdh.h

diff --git a/include/asm-blackfin/shared_resources.h b/arch/blackfin/include/asm/shared_resources.h
similarity index 100%
rename from include/asm-blackfin/shared_resources.h
rename to arch/blackfin/include/asm/shared_resources.h

diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h
similarity index 100%
rename from include/asm-blackfin/signal.h
rename to arch/blackfin/include/asm/signal.h

diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h
similarity index 100%
rename from include/asm-blackfin/string.h
rename to arch/blackfin/include/asm/string.h

diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h
similarity index 100%
rename from include/asm-blackfin/system.h
rename to arch/blackfin/include/asm/system.h

diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h
similarity index 100%
rename from include/asm-blackfin/traps.h
rename to arch/blackfin/include/asm/traps.h

diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h
similarity index 100%
rename from include/asm-blackfin/types.h
rename to arch/blackfin/include/asm/types.h

diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h
similarity index 100%
rename from include/asm-blackfin/u-boot.h
rename to arch/blackfin/include/asm/u-boot.h

diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h
similarity index 100%
rename from include/asm-blackfin/unaligned.h
rename to arch/blackfin/include/asm/unaligned.h

diff --git a/include/asm-i386/bitops.h b/arch/i386/include/asm/bitops.h
similarity index 100%
rename from include/asm-i386/bitops.h
rename to arch/i386/include/asm/bitops.h

diff --git a/include/asm-i386/byteorder.h b/arch/i386/include/asm/byteorder.h
similarity index 100%
rename from include/asm-i386/byteorder.h
rename to arch/i386/include/asm/byteorder.h

diff --git a/include/asm-i386/config.h b/arch/i386/include/asm/config.h
similarity index 100%
rename from include/asm-i386/config.h
rename to arch/i386/include/asm/config.h

diff --git a/include/asm-i386/errno.h b/arch/i386/include/asm/errno.h
similarity index 100%
rename from include/asm-i386/errno.h
rename to arch/i386/include/asm/errno.h

diff --git a/include/asm-i386/global_data.h b/arch/i386/include/asm/global_data.h
similarity index 100%
rename from include/asm-i386/global_data.h
rename to arch/i386/include/asm/global_data.h

diff --git a/include/asm-i386/i8254.h b/arch/i386/include/asm/i8254.h
similarity index 100%
rename from include/asm-i386/i8254.h
rename to arch/i386/include/asm/i8254.h

diff --git a/include/asm-i386/i8259.h b/arch/i386/include/asm/i8259.h
similarity index 100%
rename from include/asm-i386/i8259.h
rename to arch/i386/include/asm/i8259.h

diff --git a/include/asm-i386/ibmpc.h b/arch/i386/include/asm/ibmpc.h
similarity index 100%
rename from include/asm-i386/ibmpc.h
rename to arch/i386/include/asm/ibmpc.h

diff --git a/include/asm-i386/ic/pci.h b/arch/i386/include/asm/ic/pci.h
similarity index 100%
rename from include/asm-i386/ic/pci.h
rename to arch/i386/include/asm/ic/pci.h

diff --git a/include/asm-i386/ic/sc520.h b/arch/i386/include/asm/ic/sc520.h
similarity index 100%
rename from include/asm-i386/ic/sc520.h
rename to arch/i386/include/asm/ic/sc520.h

diff --git a/include/asm-i386/ic/ssi.h b/arch/i386/include/asm/ic/ssi.h
similarity index 100%
rename from include/asm-i386/ic/ssi.h
rename to arch/i386/include/asm/ic/ssi.h

diff --git a/include/asm-i386/interrupt.h b/arch/i386/include/asm/interrupt.h
similarity index 100%
rename from include/asm-i386/interrupt.h
rename to arch/i386/include/asm/interrupt.h

diff --git a/include/asm-i386/io.h b/arch/i386/include/asm/io.h
similarity index 100%
rename from include/asm-i386/io.h
rename to arch/i386/include/asm/io.h

diff --git a/include/asm-i386/pci.h b/arch/i386/include/asm/pci.h
similarity index 100%
rename from include/asm-i386/pci.h
rename to arch/i386/include/asm/pci.h

diff --git a/include/asm-i386/posix_types.h b/arch/i386/include/asm/posix_types.h
similarity index 100%
rename from include/asm-i386/posix_types.h
rename to arch/i386/include/asm/posix_types.h

diff --git a/include/asm-i386/processor.h b/arch/i386/include/asm/processor.h
similarity index 100%
rename from include/asm-i386/processor.h
rename to arch/i386/include/asm/processor.h

diff --git a/include/asm-i386/ptrace.h b/arch/i386/include/asm/ptrace.h
similarity index 100%
rename from include/asm-i386/ptrace.h
rename to arch/i386/include/asm/ptrace.h

diff --git a/include/asm-i386/realmode.h b/arch/i386/include/asm/realmode.h
similarity index 100%
rename from include/asm-i386/realmode.h
rename to arch/i386/include/asm/realmode.h

diff --git a/include/asm-i386/string.h b/arch/i386/include/asm/string.h
similarity index 100%
rename from include/asm-i386/string.h
rename to arch/i386/include/asm/string.h

diff --git a/include/asm-i386/types.h b/arch/i386/include/asm/types.h
similarity index 100%
rename from include/asm-i386/types.h
rename to arch/i386/include/asm/types.h

diff --git a/include/asm-i386/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h
similarity index 100%
rename from include/asm-i386/u-boot-i386.h
rename to arch/i386/include/asm/u-boot-i386.h

diff --git a/include/asm-i386/u-boot.h b/arch/i386/include/asm/u-boot.h
similarity index 100%
rename from include/asm-i386/u-boot.h
rename to arch/i386/include/asm/u-boot.h

diff --git a/include/asm-i386/zimage.h b/arch/i386/include/asm/zimage.h
similarity index 100%
rename from include/asm-i386/zimage.h
rename to arch/i386/include/asm/zimage.h

diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h
similarity index 100%
rename from include/asm-m68k/bitops.h
rename to arch/m68k/include/asm/bitops.h

diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h
similarity index 100%
rename from include/asm-m68k/byteorder.h
rename to arch/m68k/include/asm/byteorder.h

diff --git a/include/asm-m68k/cache.h b/arch/m68k/include/asm/cache.h
similarity index 100%
rename from include/asm-m68k/cache.h
rename to arch/m68k/include/asm/cache.h

diff --git a/include/asm-m68k/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h
similarity index 100%
rename from include/asm-m68k/coldfire/ata.h
rename to arch/m68k/include/asm/coldfire/ata.h

diff --git a/include/asm-m68k/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h
similarity index 100%
rename from include/asm-m68k/coldfire/crossbar.h
rename to arch/m68k/include/asm/coldfire/crossbar.h

diff --git a/include/asm-m68k/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h
similarity index 100%
rename from include/asm-m68k/coldfire/dspi.h
rename to arch/m68k/include/asm/coldfire/dspi.h

diff --git a/include/asm-m68k/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h
similarity index 100%
rename from include/asm-m68k/coldfire/edma.h
rename to arch/m68k/include/asm/coldfire/edma.h

diff --git a/include/asm-m68k/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h
similarity index 100%
rename from include/asm-m68k/coldfire/eport.h
rename to arch/m68k/include/asm/coldfire/eport.h

diff --git a/include/asm-m68k/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h
similarity index 100%
rename from include/asm-m68k/coldfire/flexbus.h
rename to arch/m68k/include/asm/coldfire/flexbus.h

diff --git a/include/asm-m68k/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h
similarity index 100%
rename from include/asm-m68k/coldfire/flexcan.h
rename to arch/m68k/include/asm/coldfire/flexcan.h

diff --git a/include/asm-m68k/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
similarity index 100%
rename from include/asm-m68k/coldfire/intctrl.h
rename to arch/m68k/include/asm/coldfire/intctrl.h

diff --git a/include/asm-m68k/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h
similarity index 100%
rename from include/asm-m68k/coldfire/lcd.h
rename to arch/m68k/include/asm/coldfire/lcd.h

diff --git a/include/asm-m68k/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h
similarity index 100%
rename from include/asm-m68k/coldfire/mdha.h
rename to arch/m68k/include/asm/coldfire/mdha.h

diff --git a/include/asm-m68k/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h
similarity index 100%
rename from include/asm-m68k/coldfire/pwm.h
rename to arch/m68k/include/asm/coldfire/pwm.h

diff --git a/include/asm-m68k/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h
similarity index 100%
rename from include/asm-m68k/coldfire/qspi.h
rename to arch/m68k/include/asm/coldfire/qspi.h

diff --git a/include/asm-m68k/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h
similarity index 100%
rename from include/asm-m68k/coldfire/rng.h
rename to arch/m68k/include/asm/coldfire/rng.h

diff --git a/include/asm-m68k/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h
similarity index 100%
rename from include/asm-m68k/coldfire/skha.h
rename to arch/m68k/include/asm/coldfire/skha.h

diff --git a/include/asm-m68k/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h
similarity index 100%
rename from include/asm-m68k/coldfire/ssi.h
rename to arch/m68k/include/asm/coldfire/ssi.h

diff --git a/include/asm-m68k/config.h b/arch/m68k/include/asm/config.h
similarity index 100%
rename from include/asm-m68k/config.h
rename to arch/m68k/include/asm/config.h

diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h
similarity index 100%
rename from include/asm-m68k/errno.h
rename to arch/m68k/include/asm/errno.h

diff --git a/include/asm-m68k/fec.h b/arch/m68k/include/asm/fec.h
similarity index 100%
rename from include/asm-m68k/fec.h
rename to arch/m68k/include/asm/fec.h

diff --git a/include/asm-m68k/fsl_i2c.h b/arch/m68k/include/asm/fsl_i2c.h
similarity index 100%
rename from include/asm-m68k/fsl_i2c.h
rename to arch/m68k/include/asm/fsl_i2c.h

diff --git a/include/asm-m68k/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h
similarity index 100%
rename from include/asm-m68k/fsl_mcdmafec.h
rename to arch/m68k/include/asm/fsl_mcdmafec.h

diff --git a/include/asm-m68k/global_data.h b/arch/m68k/include/asm/global_data.h
similarity index 100%
rename from include/asm-m68k/global_data.h
rename to arch/m68k/include/asm/global_data.h

diff --git a/include/asm-m68k/immap.h b/arch/m68k/include/asm/immap.h
similarity index 100%
rename from include/asm-m68k/immap.h
rename to arch/m68k/include/asm/immap.h

diff --git a/include/asm-m68k/immap_520x.h b/arch/m68k/include/asm/immap_520x.h
similarity index 100%
rename from include/asm-m68k/immap_520x.h
rename to arch/m68k/include/asm/immap_520x.h

diff --git a/include/asm-m68k/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h
similarity index 100%
rename from include/asm-m68k/immap_5227x.h
rename to arch/m68k/include/asm/immap_5227x.h

diff --git a/include/asm-m68k/immap_5235.h b/arch/m68k/include/asm/immap_5235.h
similarity index 100%
rename from include/asm-m68k/immap_5235.h
rename to arch/m68k/include/asm/immap_5235.h

diff --git a/include/asm-m68k/immap_5249.h b/arch/m68k/include/asm/immap_5249.h
similarity index 100%
rename from include/asm-m68k/immap_5249.h
rename to arch/m68k/include/asm/immap_5249.h

diff --git a/include/asm-m68k/immap_5253.h b/arch/m68k/include/asm/immap_5253.h
similarity index 100%
rename from include/asm-m68k/immap_5253.h
rename to arch/m68k/include/asm/immap_5253.h

diff --git a/include/asm-m68k/immap_5271.h b/arch/m68k/include/asm/immap_5271.h
similarity index 100%
rename from include/asm-m68k/immap_5271.h
rename to arch/m68k/include/asm/immap_5271.h

diff --git a/include/asm-m68k/immap_5272.h b/arch/m68k/include/asm/immap_5272.h
similarity index 100%
rename from include/asm-m68k/immap_5272.h
rename to arch/m68k/include/asm/immap_5272.h

diff --git a/include/asm-m68k/immap_5275.h b/arch/m68k/include/asm/immap_5275.h
similarity index 100%
rename from include/asm-m68k/immap_5275.h
rename to arch/m68k/include/asm/immap_5275.h

diff --git a/include/asm-m68k/immap_5282.h b/arch/m68k/include/asm/immap_5282.h
similarity index 100%
rename from include/asm-m68k/immap_5282.h
rename to arch/m68k/include/asm/immap_5282.h

diff --git a/include/asm-m68k/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h
similarity index 100%
rename from include/asm-m68k/immap_5301x.h
rename to arch/m68k/include/asm/immap_5301x.h

diff --git a/include/asm-m68k/immap_5329.h b/arch/m68k/include/asm/immap_5329.h
similarity index 100%
rename from include/asm-m68k/immap_5329.h
rename to arch/m68k/include/asm/immap_5329.h

diff --git a/include/asm-m68k/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h
similarity index 100%
rename from include/asm-m68k/immap_5445x.h
rename to arch/m68k/include/asm/immap_5445x.h

diff --git a/include/asm-m68k/immap_547x_8x.h b/arch/m68k/include/asm/immap_547x_8x.h
similarity index 100%
rename from include/asm-m68k/immap_547x_8x.h
rename to arch/m68k/include/asm/immap_547x_8x.h

diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h
similarity index 100%
rename from include/asm-m68k/io.h
rename to arch/m68k/include/asm/io.h

diff --git a/include/asm-m68k/m520x.h b/arch/m68k/include/asm/m520x.h
similarity index 100%
rename from include/asm-m68k/m520x.h
rename to arch/m68k/include/asm/m520x.h

diff --git a/include/asm-m68k/m5227x.h b/arch/m68k/include/asm/m5227x.h
similarity index 100%
rename from include/asm-m68k/m5227x.h
rename to arch/m68k/include/asm/m5227x.h

diff --git a/include/asm-m68k/m5235.h b/arch/m68k/include/asm/m5235.h
similarity index 100%
rename from include/asm-m68k/m5235.h
rename to arch/m68k/include/asm/m5235.h

diff --git a/include/asm-m68k/m5249.h b/arch/m68k/include/asm/m5249.h
similarity index 100%
rename from include/asm-m68k/m5249.h
rename to arch/m68k/include/asm/m5249.h

diff --git a/include/asm-m68k/m5253.h b/arch/m68k/include/asm/m5253.h
similarity index 100%
rename from include/asm-m68k/m5253.h
rename to arch/m68k/include/asm/m5253.h

diff --git a/include/asm-m68k/m5271.h b/arch/m68k/include/asm/m5271.h
similarity index 100%
rename from include/asm-m68k/m5271.h
rename to arch/m68k/include/asm/m5271.h

diff --git a/include/asm-m68k/m5272.h b/arch/m68k/include/asm/m5272.h
similarity index 100%
rename from include/asm-m68k/m5272.h
rename to arch/m68k/include/asm/m5272.h

diff --git a/include/asm-m68k/m5275.h b/arch/m68k/include/asm/m5275.h
similarity index 100%
rename from include/asm-m68k/m5275.h
rename to arch/m68k/include/asm/m5275.h

diff --git a/include/asm-m68k/m5282.h b/arch/m68k/include/asm/m5282.h
similarity index 100%
rename from include/asm-m68k/m5282.h
rename to arch/m68k/include/asm/m5282.h

diff --git a/include/asm-m68k/m5301x.h b/arch/m68k/include/asm/m5301x.h
similarity index 100%
rename from include/asm-m68k/m5301x.h
rename to arch/m68k/include/asm/m5301x.h

diff --git a/include/asm-m68k/m5329.h b/arch/m68k/include/asm/m5329.h
similarity index 100%
rename from include/asm-m68k/m5329.h
rename to arch/m68k/include/asm/m5329.h

diff --git a/include/asm-m68k/m5445x.h b/arch/m68k/include/asm/m5445x.h
similarity index 100%
rename from include/asm-m68k/m5445x.h
rename to arch/m68k/include/asm/m5445x.h

diff --git a/include/asm-m68k/m547x_8x.h b/arch/m68k/include/asm/m547x_8x.h
similarity index 100%
rename from include/asm-m68k/m547x_8x.h
rename to arch/m68k/include/asm/m547x_8x.h

diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h
similarity index 100%
rename from include/asm-m68k/posix_types.h
rename to arch/m68k/include/asm/posix_types.h

diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h
similarity index 100%
rename from include/asm-m68k/processor.h
rename to arch/m68k/include/asm/processor.h

diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h
similarity index 100%
rename from include/asm-m68k/ptrace.h
rename to arch/m68k/include/asm/ptrace.h

diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h
similarity index 100%
rename from include/asm-m68k/rtc.h
rename to arch/m68k/include/asm/rtc.h

diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h
similarity index 100%
rename from include/asm-m68k/string.h
rename to arch/m68k/include/asm/string.h

diff --git a/include/asm-m68k/timer.h b/arch/m68k/include/asm/timer.h
similarity index 100%
rename from include/asm-m68k/timer.h
rename to arch/m68k/include/asm/timer.h

diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h
similarity index 100%
rename from include/asm-m68k/types.h
rename to arch/m68k/include/asm/types.h

diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h
similarity index 100%
rename from include/asm-m68k/u-boot.h
rename to arch/m68k/include/asm/u-boot.h

diff --git a/include/asm-m68k/uart.h b/arch/m68k/include/asm/uart.h
similarity index 100%
rename from include/asm-m68k/uart.h
rename to arch/m68k/include/asm/uart.h

diff --git a/include/asm-m68k/unaligned.h b/arch/m68k/include/asm/unaligned.h
similarity index 100%
rename from include/asm-m68k/unaligned.h
rename to arch/m68k/include/asm/unaligned.h

diff --git a/include/asm-microblaze/asm.h b/arch/microblaze/include/asm/asm.h
similarity index 100%
rename from include/asm-microblaze/asm.h
rename to arch/microblaze/include/asm/asm.h

diff --git a/include/asm-microblaze/bitops.h b/arch/microblaze/include/asm/bitops.h
similarity index 100%
rename from include/asm-microblaze/bitops.h
rename to arch/microblaze/include/asm/bitops.h

diff --git a/include/asm-microblaze/byteorder.h b/arch/microblaze/include/asm/byteorder.h
similarity index 100%
rename from include/asm-microblaze/byteorder.h
rename to arch/microblaze/include/asm/byteorder.h

diff --git a/include/asm-microblaze/config.h b/arch/microblaze/include/asm/config.h
similarity index 100%
rename from include/asm-microblaze/config.h
rename to arch/microblaze/include/asm/config.h

diff --git a/include/asm-microblaze/errno.h b/arch/microblaze/include/asm/errno.h
similarity index 100%
rename from include/asm-microblaze/errno.h
rename to arch/microblaze/include/asm/errno.h

diff --git a/include/asm-microblaze/global_data.h b/arch/microblaze/include/asm/global_data.h
similarity index 100%
rename from include/asm-microblaze/global_data.h
rename to arch/microblaze/include/asm/global_data.h

diff --git a/include/asm-microblaze/io.h b/arch/microblaze/include/asm/io.h
similarity index 100%
rename from include/asm-microblaze/io.h
rename to arch/microblaze/include/asm/io.h

diff --git a/include/asm-microblaze/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h
similarity index 100%
rename from include/asm-microblaze/microblaze_intc.h
rename to arch/microblaze/include/asm/microblaze_intc.h

diff --git a/include/asm-microblaze/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h
similarity index 100%
rename from include/asm-microblaze/microblaze_timer.h
rename to arch/microblaze/include/asm/microblaze_timer.h

diff --git a/include/asm-microblaze/posix_types.h b/arch/microblaze/include/asm/posix_types.h
similarity index 100%
rename from include/asm-microblaze/posix_types.h
rename to arch/microblaze/include/asm/posix_types.h

diff --git a/include/asm-microblaze/processor.h b/arch/microblaze/include/asm/processor.h
similarity index 100%
rename from include/asm-microblaze/processor.h
rename to arch/microblaze/include/asm/processor.h

diff --git a/include/asm-microblaze/ptrace.h b/arch/microblaze/include/asm/ptrace.h
similarity index 100%
rename from include/asm-microblaze/ptrace.h
rename to arch/microblaze/include/asm/ptrace.h

diff --git a/include/asm-microblaze/string.h b/arch/microblaze/include/asm/string.h
similarity index 100%
rename from include/asm-microblaze/string.h
rename to arch/microblaze/include/asm/string.h

diff --git a/include/asm-microblaze/system.h b/arch/microblaze/include/asm/system.h
similarity index 100%
rename from include/asm-microblaze/system.h
rename to arch/microblaze/include/asm/system.h

diff --git a/include/asm-microblaze/types.h b/arch/microblaze/include/asm/types.h
similarity index 100%
rename from include/asm-microblaze/types.h
rename to arch/microblaze/include/asm/types.h

diff --git a/include/asm-microblaze/u-boot.h b/arch/microblaze/include/asm/u-boot.h
similarity index 100%
rename from include/asm-microblaze/u-boot.h
rename to arch/microblaze/include/asm/u-boot.h

diff --git a/include/asm-microblaze/unaligned.h b/arch/microblaze/include/asm/unaligned.h
similarity index 100%
rename from include/asm-microblaze/unaligned.h
rename to arch/microblaze/include/asm/unaligned.h

diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h
similarity index 100%
rename from include/asm-mips/addrspace.h
rename to arch/mips/include/asm/addrspace.h

diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h
similarity index 100%
rename from include/asm-mips/asm.h
rename to arch/mips/include/asm/asm.h

diff --git a/include/asm-mips/au1x00.h b/arch/mips/include/asm/au1x00.h
similarity index 100%
rename from include/asm-mips/au1x00.h
rename to arch/mips/include/asm/au1x00.h

diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h
similarity index 100%
rename from include/asm-mips/bitops.h
rename to arch/mips/include/asm/bitops.h

diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h
similarity index 100%
rename from include/asm-mips/byteorder.h
rename to arch/mips/include/asm/byteorder.h

diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h
similarity index 100%
rename from include/asm-mips/cachectl.h
rename to arch/mips/include/asm/cachectl.h

diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h
similarity index 100%
rename from include/asm-mips/cacheops.h
rename to arch/mips/include/asm/cacheops.h

diff --git a/include/asm-mips/config.h b/arch/mips/include/asm/config.h
similarity index 100%
rename from include/asm-mips/config.h
rename to arch/mips/include/asm/config.h

diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h
similarity index 100%
rename from include/asm-mips/errno.h
rename to arch/mips/include/asm/errno.h

diff --git a/include/asm-mips/global_data.h b/arch/mips/include/asm/global_data.h
similarity index 100%
rename from include/asm-mips/global_data.h
rename to arch/mips/include/asm/global_data.h

diff --git a/include/asm-mips/inca-ip.h b/arch/mips/include/asm/inca-ip.h
similarity index 100%
rename from include/asm-mips/inca-ip.h
rename to arch/mips/include/asm/inca-ip.h

diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h
similarity index 100%
rename from include/asm-mips/io.h
rename to arch/mips/include/asm/io.h

diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h
similarity index 100%
rename from include/asm-mips/isadep.h
rename to arch/mips/include/asm/isadep.h

diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h
similarity index 100%
rename from include/asm-mips/mipsregs.h
rename to arch/mips/include/asm/mipsregs.h

diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h
similarity index 100%
rename from include/asm-mips/posix_types.h
rename to arch/mips/include/asm/posix_types.h

diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h
similarity index 100%
rename from include/asm-mips/processor.h
rename to arch/mips/include/asm/processor.h

diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h
similarity index 100%
rename from include/asm-mips/ptrace.h
rename to arch/mips/include/asm/ptrace.h

diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h
similarity index 100%
rename from include/asm-mips/reboot.h
rename to arch/mips/include/asm/reboot.h

diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h
similarity index 100%
rename from include/asm-mips/reg.h
rename to arch/mips/include/asm/reg.h

diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h
similarity index 100%
rename from include/asm-mips/regdef.h
rename to arch/mips/include/asm/regdef.h

diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h
similarity index 100%
rename from include/asm-mips/sgidefs.h
rename to arch/mips/include/asm/sgidefs.h

diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h
similarity index 100%
rename from include/asm-mips/string.h
rename to arch/mips/include/asm/string.h

diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h
similarity index 100%
rename from include/asm-mips/system.h
rename to arch/mips/include/asm/system.h

diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h
similarity index 100%
rename from include/asm-mips/types.h
rename to arch/mips/include/asm/types.h

diff --git a/include/asm-mips/u-boot.h b/arch/mips/include/asm/u-boot.h
similarity index 100%
rename from include/asm-mips/u-boot.h
rename to arch/mips/include/asm/u-boot.h

diff --git a/include/asm-mips/unaligned.h b/arch/mips/include/asm/unaligned.h
similarity index 100%
rename from include/asm-mips/unaligned.h
rename to arch/mips/include/asm/unaligned.h

diff --git a/include/asm-nios/bitops.h b/arch/nios/include/asm/bitops.h
similarity index 100%
rename from include/asm-nios/bitops.h
rename to arch/nios/include/asm/bitops.h

diff --git a/include/asm-nios/byteorder.h b/arch/nios/include/asm/byteorder.h
similarity index 100%
rename from include/asm-nios/byteorder.h
rename to arch/nios/include/asm/byteorder.h

diff --git a/include/asm-nios/cache.h b/arch/nios/include/asm/cache.h
similarity index 100%
rename from include/asm-nios/cache.h
rename to arch/nios/include/asm/cache.h

diff --git a/include/asm-nios/config.h b/arch/nios/include/asm/config.h
similarity index 100%
rename from include/asm-nios/config.h
rename to arch/nios/include/asm/config.h

diff --git a/include/asm-nios/global_data.h b/arch/nios/include/asm/global_data.h
similarity index 100%
rename from include/asm-nios/global_data.h
rename to arch/nios/include/asm/global_data.h

diff --git a/include/asm-nios/io.h b/arch/nios/include/asm/io.h
similarity index 100%
rename from include/asm-nios/io.h
rename to arch/nios/include/asm/io.h

diff --git a/include/asm-nios/posix_types.h b/arch/nios/include/asm/posix_types.h
similarity index 100%
rename from include/asm-nios/posix_types.h
rename to arch/nios/include/asm/posix_types.h

diff --git a/include/asm-nios/processor.h b/arch/nios/include/asm/processor.h
similarity index 100%
rename from include/asm-nios/processor.h
rename to arch/nios/include/asm/processor.h

diff --git a/include/asm-nios/psr.h b/arch/nios/include/asm/psr.h
similarity index 100%
rename from include/asm-nios/psr.h
rename to arch/nios/include/asm/psr.h

diff --git a/include/asm-nios/ptrace.h b/arch/nios/include/asm/ptrace.h
similarity index 100%
rename from include/asm-nios/ptrace.h
rename to arch/nios/include/asm/ptrace.h

diff --git a/include/asm-nios/status_led.h b/arch/nios/include/asm/status_led.h
similarity index 100%
rename from include/asm-nios/status_led.h
rename to arch/nios/include/asm/status_led.h

diff --git a/include/asm-nios/string.h b/arch/nios/include/asm/string.h
similarity index 100%
rename from include/asm-nios/string.h
rename to arch/nios/include/asm/string.h

diff --git a/include/asm-nios/system.h b/arch/nios/include/asm/system.h
similarity index 100%
rename from include/asm-nios/system.h
rename to arch/nios/include/asm/system.h

diff --git a/include/asm-nios/types.h b/arch/nios/include/asm/types.h
similarity index 100%
rename from include/asm-nios/types.h
rename to arch/nios/include/asm/types.h

diff --git a/include/asm-nios/u-boot.h b/arch/nios/include/asm/u-boot.h
similarity index 100%
rename from include/asm-nios/u-boot.h
rename to arch/nios/include/asm/u-boot.h

diff --git a/include/asm-nios2/bitops.h b/arch/nios2/include/asm/bitops.h
similarity index 100%
rename from include/asm-nios2/bitops.h
rename to arch/nios2/include/asm/bitops.h

diff --git a/include/asm-nios2/bitops/atomic.h b/arch/nios2/include/asm/bitops/atomic.h
similarity index 100%
rename from include/asm-nios2/bitops/atomic.h
rename to arch/nios2/include/asm/bitops/atomic.h

diff --git a/include/asm-nios2/bitops/ffs.h b/arch/nios2/include/asm/bitops/ffs.h
similarity index 100%
rename from include/asm-nios2/bitops/ffs.h
rename to arch/nios2/include/asm/bitops/ffs.h

diff --git a/include/asm-nios2/bitops/non-atomic.h b/arch/nios2/include/asm/bitops/non-atomic.h
similarity index 100%
rename from include/asm-nios2/bitops/non-atomic.h
rename to arch/nios2/include/asm/bitops/non-atomic.h

diff --git a/include/asm-nios2/byteorder.h b/arch/nios2/include/asm/byteorder.h
similarity index 100%
rename from include/asm-nios2/byteorder.h
rename to arch/nios2/include/asm/byteorder.h

diff --git a/include/asm-nios2/cache.h b/arch/nios2/include/asm/cache.h
similarity index 100%
rename from include/asm-nios2/cache.h
rename to arch/nios2/include/asm/cache.h

diff --git a/include/asm-nios2/config.h b/arch/nios2/include/asm/config.h
similarity index 100%
rename from include/asm-nios2/config.h
rename to arch/nios2/include/asm/config.h

diff --git a/include/asm-nios2/errno.h b/arch/nios2/include/asm/errno.h
similarity index 100%
rename from include/asm-nios2/errno.h
rename to arch/nios2/include/asm/errno.h

diff --git a/include/asm-nios2/global_data.h b/arch/nios2/include/asm/global_data.h
similarity index 100%
rename from include/asm-nios2/global_data.h
rename to arch/nios2/include/asm/global_data.h

diff --git a/include/asm-nios2/io.h b/arch/nios2/include/asm/io.h
similarity index 100%
rename from include/asm-nios2/io.h
rename to arch/nios2/include/asm/io.h

diff --git a/include/asm-nios2/opcodes.h b/arch/nios2/include/asm/opcodes.h
similarity index 100%
rename from include/asm-nios2/opcodes.h
rename to arch/nios2/include/asm/opcodes.h

diff --git a/include/asm-nios2/posix_types.h b/arch/nios2/include/asm/posix_types.h
similarity index 100%
rename from include/asm-nios2/posix_types.h
rename to arch/nios2/include/asm/posix_types.h

diff --git a/include/asm-nios2/processor.h b/arch/nios2/include/asm/processor.h
similarity index 100%
rename from include/asm-nios2/processor.h
rename to arch/nios2/include/asm/processor.h

diff --git a/include/asm-nios2/psr.h b/arch/nios2/include/asm/psr.h
similarity index 100%
rename from include/asm-nios2/psr.h
rename to arch/nios2/include/asm/psr.h

diff --git a/include/asm-nios2/ptrace.h b/arch/nios2/include/asm/ptrace.h
similarity index 100%
rename from include/asm-nios2/ptrace.h
rename to arch/nios2/include/asm/ptrace.h

diff --git a/include/asm-nios2/status_led.h b/arch/nios2/include/asm/status_led.h
similarity index 100%
rename from include/asm-nios2/status_led.h
rename to arch/nios2/include/asm/status_led.h

diff --git a/include/asm-nios2/string.h b/arch/nios2/include/asm/string.h
similarity index 100%
rename from include/asm-nios2/string.h
rename to arch/nios2/include/asm/string.h

diff --git a/include/asm-nios2/system.h b/arch/nios2/include/asm/system.h
similarity index 100%
rename from include/asm-nios2/system.h
rename to arch/nios2/include/asm/system.h

diff --git a/include/asm-nios2/types.h b/arch/nios2/include/asm/types.h
similarity index 100%
rename from include/asm-nios2/types.h
rename to arch/nios2/include/asm/types.h

diff --git a/include/asm-nios2/u-boot.h b/arch/nios2/include/asm/u-boot.h
similarity index 100%
rename from include/asm-nios2/u-boot.h
rename to arch/nios2/include/asm/u-boot.h

diff --git a/include/asm-nios2/unaligned.h b/arch/nios2/include/asm/unaligned.h
similarity index 100%
rename from include/asm-nios2/unaligned.h
rename to arch/nios2/include/asm/unaligned.h

diff --git a/include/asm-ppc/4xx_pci.h b/arch/ppc/include/asm/4xx_pci.h
similarity index 100%
rename from include/asm-ppc/4xx_pci.h
rename to arch/ppc/include/asm/4xx_pci.h

diff --git a/include/asm-ppc/4xx_pcie.h b/arch/ppc/include/asm/4xx_pcie.h
similarity index 100%
rename from include/asm-ppc/4xx_pcie.h
rename to arch/ppc/include/asm/4xx_pcie.h

diff --git a/include/asm-ppc/5xx_immap.h b/arch/ppc/include/asm/5xx_immap.h
similarity index 100%
rename from include/asm-ppc/5xx_immap.h
rename to arch/ppc/include/asm/5xx_immap.h

diff --git a/include/asm-ppc/8xx_immap.h b/arch/ppc/include/asm/8xx_immap.h
similarity index 100%
rename from include/asm-ppc/8xx_immap.h
rename to arch/ppc/include/asm/8xx_immap.h

diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h
similarity index 100%
rename from include/asm-ppc/atomic.h
rename to arch/ppc/include/asm/atomic.h

diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h
similarity index 100%
rename from include/asm-ppc/bitops.h
rename to arch/ppc/include/asm/bitops.h

diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h
similarity index 100%
rename from include/asm-ppc/byteorder.h
rename to arch/ppc/include/asm/byteorder.h

diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h
similarity index 100%
rename from include/asm-ppc/cache.h
rename to arch/ppc/include/asm/cache.h

diff --git a/include/asm-ppc/config.h b/arch/ppc/include/asm/config.h
similarity index 100%
rename from include/asm-ppc/config.h
rename to arch/ppc/include/asm/config.h

diff --git a/include/asm-ppc/cpm_8260.h b/arch/ppc/include/asm/cpm_8260.h
similarity index 100%
rename from include/asm-ppc/cpm_8260.h
rename to arch/ppc/include/asm/cpm_8260.h

diff --git a/include/asm-ppc/cpm_85xx.h b/arch/ppc/include/asm/cpm_85xx.h
similarity index 100%
rename from include/asm-ppc/cpm_85xx.h
rename to arch/ppc/include/asm/cpm_85xx.h

diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h
similarity index 100%
rename from include/asm-ppc/e300.h
rename to arch/ppc/include/asm/e300.h

diff --git a/include/asm-ppc/errno.h b/arch/ppc/include/asm/errno.h
similarity index 100%
rename from include/asm-ppc/errno.h
rename to arch/ppc/include/asm/errno.h

diff --git a/include/asm-ppc/fsl_ddr_dimm_params.h b/arch/ppc/include/asm/fsl_ddr_dimm_params.h
similarity index 100%
rename from include/asm-ppc/fsl_ddr_dimm_params.h
rename to arch/ppc/include/asm/fsl_ddr_dimm_params.h

diff --git a/include/asm-ppc/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h
similarity index 100%
rename from include/asm-ppc/fsl_ddr_sdram.h
rename to arch/ppc/include/asm/fsl_ddr_sdram.h

diff --git a/include/asm-ppc/fsl_dma.h b/arch/ppc/include/asm/fsl_dma.h
similarity index 100%
rename from include/asm-ppc/fsl_dma.h
rename to arch/ppc/include/asm/fsl_dma.h

diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h
similarity index 100%
rename from include/asm-ppc/fsl_i2c.h
rename to arch/ppc/include/asm/fsl_i2c.h

diff --git a/include/asm-ppc/fsl_law.h b/arch/ppc/include/asm/fsl_law.h
similarity index 100%
rename from include/asm-ppc/fsl_law.h
rename to arch/ppc/include/asm/fsl_law.h

diff --git a/include/asm-ppc/fsl_lbc.h b/arch/ppc/include/asm/fsl_lbc.h
similarity index 100%
rename from include/asm-ppc/fsl_lbc.h
rename to arch/ppc/include/asm/fsl_lbc.h

diff --git a/include/asm-ppc/fsl_pci.h b/arch/ppc/include/asm/fsl_pci.h
similarity index 100%
rename from include/asm-ppc/fsl_pci.h
rename to arch/ppc/include/asm/fsl_pci.h

diff --git a/include/asm-ppc/fsl_serdes.h b/arch/ppc/include/asm/fsl_serdes.h
similarity index 100%
rename from include/asm-ppc/fsl_serdes.h
rename to arch/ppc/include/asm/fsl_serdes.h

diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h
similarity index 100%
rename from include/asm-ppc/global_data.h
rename to arch/ppc/include/asm/global_data.h

diff --git a/include/asm-ppc/gpio.h b/arch/ppc/include/asm/gpio.h
similarity index 100%
rename from include/asm-ppc/gpio.h
rename to arch/ppc/include/asm/gpio.h

diff --git a/include/asm-ppc/immap_512x.h b/arch/ppc/include/asm/immap_512x.h
similarity index 100%
rename from include/asm-ppc/immap_512x.h
rename to arch/ppc/include/asm/immap_512x.h

diff --git a/include/asm-ppc/immap_8220.h b/arch/ppc/include/asm/immap_8220.h
similarity index 100%
rename from include/asm-ppc/immap_8220.h
rename to arch/ppc/include/asm/immap_8220.h

diff --git a/include/asm-ppc/immap_8260.h b/arch/ppc/include/asm/immap_8260.h
similarity index 100%
rename from include/asm-ppc/immap_8260.h
rename to arch/ppc/include/asm/immap_8260.h

diff --git a/include/asm-ppc/immap_83xx.h b/arch/ppc/include/asm/immap_83xx.h
similarity index 100%
rename from include/asm-ppc/immap_83xx.h
rename to arch/ppc/include/asm/immap_83xx.h

diff --git a/include/asm-ppc/immap_85xx.h b/arch/ppc/include/asm/immap_85xx.h
similarity index 100%
rename from include/asm-ppc/immap_85xx.h
rename to arch/ppc/include/asm/immap_85xx.h

diff --git a/include/asm-ppc/immap_86xx.h b/arch/ppc/include/asm/immap_86xx.h
similarity index 100%
rename from include/asm-ppc/immap_86xx.h
rename to arch/ppc/include/asm/immap_86xx.h

diff --git a/include/asm-ppc/immap_qe.h b/arch/ppc/include/asm/immap_qe.h
similarity index 100%
rename from include/asm-ppc/immap_qe.h
rename to arch/ppc/include/asm/immap_qe.h

diff --git a/include/asm-ppc/interrupt.h b/arch/ppc/include/asm/interrupt.h
similarity index 100%
rename from include/asm-ppc/interrupt.h
rename to arch/ppc/include/asm/interrupt.h

diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h
similarity index 100%
rename from include/asm-ppc/io.h
rename to arch/ppc/include/asm/io.h

diff --git a/include/asm-ppc/iopin_8260.h b/arch/ppc/include/asm/iopin_8260.h
similarity index 100%
rename from include/asm-ppc/iopin_8260.h
rename to arch/ppc/include/asm/iopin_8260.h

diff --git a/include/asm-ppc/iopin_85xx.h b/arch/ppc/include/asm/iopin_85xx.h
similarity index 100%
rename from include/asm-ppc/iopin_85xx.h
rename to arch/ppc/include/asm/iopin_85xx.h

diff --git a/include/asm-ppc/iopin_8xx.h b/arch/ppc/include/asm/iopin_8xx.h
similarity index 100%
rename from include/asm-ppc/iopin_8xx.h
rename to arch/ppc/include/asm/iopin_8xx.h

diff --git a/include/asm-ppc/m8260_pci.h b/arch/ppc/include/asm/m8260_pci.h
similarity index 100%
rename from include/asm-ppc/m8260_pci.h
rename to arch/ppc/include/asm/m8260_pci.h

diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h
similarity index 100%
rename from include/asm-ppc/mc146818rtc.h
rename to arch/ppc/include/asm/mc146818rtc.h

diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h
similarity index 100%
rename from include/asm-ppc/mmu.h
rename to arch/ppc/include/asm/mmu.h

diff --git a/include/asm-ppc/mp.h b/arch/ppc/include/asm/mp.h
similarity index 100%
rename from include/asm-ppc/mp.h
rename to arch/ppc/include/asm/mp.h

diff --git a/include/asm-ppc/mpc512x.h b/arch/ppc/include/asm/mpc512x.h
similarity index 100%
rename from include/asm-ppc/mpc512x.h
rename to arch/ppc/include/asm/mpc512x.h

diff --git a/include/asm-ppc/mpc8349_pci.h b/arch/ppc/include/asm/mpc8349_pci.h
similarity index 100%
rename from include/asm-ppc/mpc8349_pci.h
rename to arch/ppc/include/asm/mpc8349_pci.h

diff --git a/include/asm-ppc/mpc8xxx_spi.h b/arch/ppc/include/asm/mpc8xxx_spi.h
similarity index 100%
rename from include/asm-ppc/mpc8xxx_spi.h
rename to arch/ppc/include/asm/mpc8xxx_spi.h

diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h
similarity index 100%
rename from include/asm-ppc/pci_io.h
rename to arch/ppc/include/asm/pci_io.h

diff --git a/include/asm-ppc/pnp.h b/arch/ppc/include/asm/pnp.h
similarity index 100%
rename from include/asm-ppc/pnp.h
rename to arch/ppc/include/asm/pnp.h

diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h
similarity index 100%
rename from include/asm-ppc/posix_types.h
rename to arch/ppc/include/asm/posix_types.h

diff --git a/include/asm-ppc/ppc4xx-ebc.h b/arch/ppc/include/asm/ppc4xx-ebc.h
similarity index 100%
rename from include/asm-ppc/ppc4xx-ebc.h
rename to arch/ppc/include/asm/ppc4xx-ebc.h

diff --git a/include/asm-ppc/ppc4xx-isram.h b/arch/ppc/include/asm/ppc4xx-isram.h
similarity index 100%
rename from include/asm-ppc/ppc4xx-isram.h
rename to arch/ppc/include/asm/ppc4xx-isram.h

diff --git a/include/asm-ppc/ppc4xx-sdram.h b/arch/ppc/include/asm/ppc4xx-sdram.h
similarity index 100%
rename from include/asm-ppc/ppc4xx-sdram.h
rename to arch/ppc/include/asm/ppc4xx-sdram.h

diff --git a/include/asm-ppc/ppc4xx-uic.h b/arch/ppc/include/asm/ppc4xx-uic.h
similarity index 100%
rename from include/asm-ppc/ppc4xx-uic.h
rename to arch/ppc/include/asm/ppc4xx-uic.h

diff --git a/include/asm-ppc/ppc4xx_config.h b/arch/ppc/include/asm/ppc4xx_config.h
similarity index 100%
rename from include/asm-ppc/ppc4xx_config.h
rename to arch/ppc/include/asm/ppc4xx_config.h

diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h
similarity index 100%
rename from include/asm-ppc/processor.h
rename to arch/ppc/include/asm/processor.h

diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h
similarity index 100%
rename from include/asm-ppc/ptrace.h
rename to arch/ppc/include/asm/ptrace.h

diff --git a/include/asm-ppc/residual.h b/arch/ppc/include/asm/residual.h
similarity index 100%
rename from include/asm-ppc/residual.h
rename to arch/ppc/include/asm/residual.h

diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h
similarity index 100%
rename from include/asm-ppc/sigcontext.h
rename to arch/ppc/include/asm/sigcontext.h

diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h
similarity index 100%
rename from include/asm-ppc/signal.h
rename to arch/ppc/include/asm/signal.h

diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h
similarity index 100%
rename from include/asm-ppc/status_led.h
rename to arch/ppc/include/asm/status_led.h

diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h
similarity index 100%
rename from include/asm-ppc/string.h
rename to arch/ppc/include/asm/string.h

diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h
similarity index 100%
rename from include/asm-ppc/types.h
rename to arch/ppc/include/asm/types.h

diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h
similarity index 100%
rename from include/asm-ppc/u-boot.h
rename to arch/ppc/include/asm/u-boot.h

diff --git a/include/asm-ppc/unaligned.h b/arch/ppc/include/asm/unaligned.h
similarity index 100%
rename from include/asm-ppc/unaligned.h
rename to arch/ppc/include/asm/unaligned.h

diff --git a/include/asm-ppc/xilinx_irq.h b/arch/ppc/include/asm/xilinx_irq.h
similarity index 100%
rename from include/asm-ppc/xilinx_irq.h
rename to arch/ppc/include/asm/xilinx_irq.h

diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h
similarity index 100%
rename from include/asm-sh/bitops.h
rename to arch/sh/include/asm/bitops.h

diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h
similarity index 100%
rename from include/asm-sh/byteorder.h
rename to arch/sh/include/asm/byteorder.h

diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h
similarity index 100%
rename from include/asm-sh/cache.h
rename to arch/sh/include/asm/cache.h

diff --git a/include/asm-sh/clk.h b/arch/sh/include/asm/clk.h
similarity index 100%
rename from include/asm-sh/clk.h
rename to arch/sh/include/asm/clk.h

diff --git a/include/asm-sh/config.h b/arch/sh/include/asm/config.h
similarity index 100%
rename from include/asm-sh/config.h
rename to arch/sh/include/asm/config.h

diff --git a/include/asm-sh/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h
similarity index 100%
rename from include/asm-sh/cpu_sh2.h
rename to arch/sh/include/asm/cpu_sh2.h

diff --git a/include/asm-sh/cpu_sh3.h b/arch/sh/include/asm/cpu_sh3.h
similarity index 100%
rename from include/asm-sh/cpu_sh3.h
rename to arch/sh/include/asm/cpu_sh3.h

diff --git a/include/asm-sh/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h
similarity index 100%
rename from include/asm-sh/cpu_sh4.h
rename to arch/sh/include/asm/cpu_sh4.h

diff --git a/include/asm-sh/cpu_sh7203.h b/arch/sh/include/asm/cpu_sh7203.h
similarity index 100%
rename from include/asm-sh/cpu_sh7203.h
rename to arch/sh/include/asm/cpu_sh7203.h

diff --git a/include/asm-sh/cpu_sh7710.h b/arch/sh/include/asm/cpu_sh7710.h
similarity index 100%
rename from include/asm-sh/cpu_sh7710.h
rename to arch/sh/include/asm/cpu_sh7710.h

diff --git a/include/asm-sh/cpu_sh7720.h b/arch/sh/include/asm/cpu_sh7720.h
similarity index 100%
rename from include/asm-sh/cpu_sh7720.h
rename to arch/sh/include/asm/cpu_sh7720.h

diff --git a/include/asm-sh/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h
similarity index 100%
rename from include/asm-sh/cpu_sh7722.h
rename to arch/sh/include/asm/cpu_sh7722.h

diff --git a/include/asm-sh/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h
similarity index 100%
rename from include/asm-sh/cpu_sh7723.h
rename to arch/sh/include/asm/cpu_sh7723.h

diff --git a/include/asm-sh/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h
similarity index 100%
rename from include/asm-sh/cpu_sh7750.h
rename to arch/sh/include/asm/cpu_sh7750.h

diff --git a/include/asm-sh/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h
similarity index 100%
rename from include/asm-sh/cpu_sh7763.h
rename to arch/sh/include/asm/cpu_sh7763.h

diff --git a/include/asm-sh/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h
similarity index 100%
rename from include/asm-sh/cpu_sh7780.h
rename to arch/sh/include/asm/cpu_sh7780.h

diff --git a/include/asm-sh/cpu_sh7785.h b/arch/sh/include/asm/cpu_sh7785.h
similarity index 100%
rename from include/asm-sh/cpu_sh7785.h
rename to arch/sh/include/asm/cpu_sh7785.h

diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h
similarity index 100%
rename from include/asm-sh/errno.h
rename to arch/sh/include/asm/errno.h

diff --git a/include/asm-sh/global_data.h b/arch/sh/include/asm/global_data.h
similarity index 100%
rename from include/asm-sh/global_data.h
rename to arch/sh/include/asm/global_data.h

diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h
similarity index 100%
rename from include/asm-sh/io.h
rename to arch/sh/include/asm/io.h

diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h
similarity index 100%
rename from include/asm-sh/irqflags.h
rename to arch/sh/include/asm/irqflags.h

diff --git a/include/asm-sh/macro.h b/arch/sh/include/asm/macro.h
similarity index 100%
rename from include/asm-sh/macro.h
rename to arch/sh/include/asm/macro.h

diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h
similarity index 100%
rename from include/asm-sh/pci.h
rename to arch/sh/include/asm/pci.h

diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h
similarity index 100%
rename from include/asm-sh/posix_types.h
rename to arch/sh/include/asm/posix_types.h

diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h
similarity index 100%
rename from include/asm-sh/processor.h
rename to arch/sh/include/asm/processor.h

diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h
similarity index 100%
rename from include/asm-sh/ptrace.h
rename to arch/sh/include/asm/ptrace.h

diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h
similarity index 100%
rename from include/asm-sh/string.h
rename to arch/sh/include/asm/string.h

diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h
similarity index 100%
rename from include/asm-sh/system.h
rename to arch/sh/include/asm/system.h

diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h
similarity index 100%
rename from include/asm-sh/types.h
rename to arch/sh/include/asm/types.h

diff --git a/include/asm-sh/u-boot.h b/arch/sh/include/asm/u-boot.h
similarity index 100%
rename from include/asm-sh/u-boot.h
rename to arch/sh/include/asm/u-boot.h

diff --git a/include/asm-sh/unaligned-sh4a.h b/arch/sh/include/asm/unaligned-sh4a.h
similarity index 100%
rename from include/asm-sh/unaligned-sh4a.h
rename to arch/sh/include/asm/unaligned-sh4a.h

diff --git a/include/asm-sh/unaligned.h b/arch/sh/include/asm/unaligned.h
similarity index 100%
rename from include/asm-sh/unaligned.h
rename to arch/sh/include/asm/unaligned.h

diff --git a/include/asm-sparc/arch-leon2/asi.h b/arch/sparc/include/asm/arch-leon2/asi.h
similarity index 100%
rename from include/asm-sparc/arch-leon2/asi.h
rename to arch/sparc/include/asm/arch-leon2/asi.h

diff --git a/include/asm-sparc/arch-leon3/asi.h b/arch/sparc/include/asm/arch-leon3/asi.h
similarity index 100%
rename from include/asm-sparc/arch-leon3/asi.h
rename to arch/sparc/include/asm/arch-leon3/asi.h

diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h
similarity index 100%
rename from include/asm-sparc/asi.h
rename to arch/sparc/include/asm/asi.h

diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
similarity index 100%
rename from include/asm-sparc/asmmacro.h
rename to arch/sparc/include/asm/asmmacro.h

diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h
similarity index 100%
rename from include/asm-sparc/atomic.h
rename to arch/sparc/include/asm/atomic.h

diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h
similarity index 100%
rename from include/asm-sparc/bitops.h
rename to arch/sparc/include/asm/bitops.h

diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h
similarity index 100%
rename from include/asm-sparc/byteorder.h
rename to arch/sparc/include/asm/byteorder.h

diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h
similarity index 100%
rename from include/asm-sparc/cache.h
rename to arch/sparc/include/asm/cache.h

diff --git a/include/asm-sparc/config.h b/arch/sparc/include/asm/config.h
similarity index 100%
rename from include/asm-sparc/config.h
rename to arch/sparc/include/asm/config.h

diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h
similarity index 100%
rename from include/asm-sparc/errno.h
rename to arch/sparc/include/asm/errno.h

diff --git a/include/asm-sparc/global_data.h b/arch/sparc/include/asm/global_data.h
similarity index 100%
rename from include/asm-sparc/global_data.h
rename to arch/sparc/include/asm/global_data.h

diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h
similarity index 100%
rename from include/asm-sparc/io.h
rename to arch/sparc/include/asm/io.h

diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h
similarity index 100%
rename from include/asm-sparc/irq.h
rename to arch/sparc/include/asm/irq.h

diff --git a/include/asm-sparc/leon.h b/arch/sparc/include/asm/leon.h
similarity index 100%
rename from include/asm-sparc/leon.h
rename to arch/sparc/include/asm/leon.h

diff --git a/include/asm-sparc/leon2.h b/arch/sparc/include/asm/leon2.h
similarity index 100%
rename from include/asm-sparc/leon2.h
rename to arch/sparc/include/asm/leon2.h

diff --git a/include/asm-sparc/leon3.h b/arch/sparc/include/asm/leon3.h
similarity index 100%
rename from include/asm-sparc/leon3.h
rename to arch/sparc/include/asm/leon3.h

diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h
similarity index 100%
rename from include/asm-sparc/machines.h
rename to arch/sparc/include/asm/machines.h

diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h
similarity index 100%
rename from include/asm-sparc/page.h
rename to arch/sparc/include/asm/page.h

diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h
similarity index 100%
rename from include/asm-sparc/posix_types.h
rename to arch/sparc/include/asm/posix_types.h

diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h
similarity index 100%
rename from include/asm-sparc/processor.h
rename to arch/sparc/include/asm/processor.h

diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h
similarity index 100%
rename from include/asm-sparc/prom.h
rename to arch/sparc/include/asm/prom.h

diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h
similarity index 100%
rename from include/asm-sparc/psr.h
rename to arch/sparc/include/asm/psr.h

diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h
similarity index 100%
rename from include/asm-sparc/ptrace.h
rename to arch/sparc/include/asm/ptrace.h

diff --git a/include/asm-sparc/srmmu.h b/arch/sparc/include/asm/srmmu.h
similarity index 100%
rename from include/asm-sparc/srmmu.h
rename to arch/sparc/include/asm/srmmu.h

diff --git a/include/asm-sparc/stack.h b/arch/sparc/include/asm/stack.h
similarity index 100%
rename from include/asm-sparc/stack.h
rename to arch/sparc/include/asm/stack.h

diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h
similarity index 100%
rename from include/asm-sparc/string.h
rename to arch/sparc/include/asm/string.h

diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h
similarity index 100%
rename from include/asm-sparc/types.h
rename to arch/sparc/include/asm/types.h

diff --git a/include/asm-sparc/u-boot.h b/arch/sparc/include/asm/u-boot.h
similarity index 100%
rename from include/asm-sparc/u-boot.h
rename to arch/sparc/include/asm/u-boot.h

diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h
similarity index 100%
rename from include/asm-sparc/winmacro.h
rename to arch/sparc/include/asm/winmacro.h

diff --git a/mkconfig b/mkconfig
index 0f7f13e3a4d836d6bb8a1ab18b34e63a4125cc2c..d3109e412c4b7837d57b5b8971410d7c013fa7ca 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -42,30 +42,28 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then
        mkdir -p ${OBJTREE}/include2
        cd ${OBJTREE}/include2
        rm -f asm
-       ln -s ${SRCTREE}/include/asm-$2 asm
-       LNPREFIX="../../include2/asm/"
+       ln -s ${SRCTREE}/arch/$2/include/asm asm
+       LNPREFIX=${SRCTREE}/arch/$2/include/asm/
        cd ../include
-       rm -rf asm-$2
        rm -f asm
-       mkdir asm-$2
-       ln -s asm-$2 asm
+       ln -s ${SRCTREE}/arch/$2/include/asm asm
 else
        cd ./include
        rm -f asm
-       ln -s asm-$2 asm
+       ln -s ../arch/$2/include/asm asm
 fi
 
-rm -f asm-$2/arch
+rm -f asm/arch
 
 if [ -z "$6" -o "$6" = "NULL" ] ; then
-       ln -s ${LNPREFIX}arch-$3 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$3 asm/arch
 else
-       ln -s ${LNPREFIX}arch-$6 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$6 asm/arch
 fi
 
 if [ "$2" = "arm" ] ; then
-       rm -f asm-$2/proc
-       ln -s ${LNPREFIX}proc-armv asm-$2/proc
+       rm -f asm/proc
+       ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
 #