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>

629 files changed, 9 insertions, 11 deletions

diff --git a/include/asm-arm/arch-a320/a320.h b/arch/arm/include/asm/arch-a320/a320.h
index fbd1583f50..fbd1583f50 100644
--- a/include/asm-arm/arch-a320/a320.h
+++ b/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
index 8ef7a37148..8ef7a37148 100644
--- a/include/asm-arm/arch-a320/ftpmu010.h
+++ b/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
index 069977200b..069977200b 100644
--- a/include/asm-arm/arch-a320/ftsdmc020.h
+++ b/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
index 95d9500339..95d9500339 100644
--- a/include/asm-arm/arch-a320/ftsmc020.h
+++ b/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
index 72abcb365d..72abcb365d 100644
--- a/include/asm-arm/arch-a320/fttmr010.h
+++ b/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
index 9bee19ffbb..9bee19ffbb 100644
--- a/include/asm-arm/arch-arm720t/hardware.h
+++ b/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
index 328eaf0da9..328eaf0da9 100644
--- a/include/asm-arm/arch-arm720t/netarm_dma_module.h
+++ b/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
index 317b354513..317b354513 100644
--- a/include/asm-arm/arch-arm720t/netarm_eni_module.h
+++ b/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
index 8f2f36981a..8f2f36981a 100644
--- a/include/asm-arm/arch-arm720t/netarm_eth_module.h
+++ b/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
index 13656a3ad2..13656a3ad2 100644
--- a/include/asm-arm/arch-arm720t/netarm_gen_module.h
+++ b/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
index c650c3b004..c650c3b004 100644
--- a/include/asm-arm/arch-arm720t/netarm_mem_module.h
+++ b/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
index fa8812879a..fa8812879a 100644
--- a/include/asm-arm/arch-arm720t/netarm_registers.h
+++ b/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
index 6fbae11c8d..6fbae11c8d 100644
--- a/include/asm-arm/arch-arm720t/netarm_ser_module.h
+++ b/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
index 7319bd9227..7319bd9227 100644
--- a/include/asm-arm/arch-arm925t/sizes.h
+++ b/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
index ef0b99b946..ef0b99b946 100644
--- a/include/asm-arm/arch-arm926ejs/sizes.h
+++ b/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
index 01840eede4..01840eede4 100644
--- a/include/asm-arm/arch-at91/at91_common.h
+++ b/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
index 45ae33311e..45ae33311e 100644
--- a/include/asm-arm/arch-at91/at91_emac.h
+++ b/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
index 981ec2029c..981ec2029c 100644
--- a/include/asm-arm/arch-at91/at91_matrix.h
+++ b/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
index acfbd10c5c..acfbd10c5c 100644
--- a/include/asm-arm/arch-at91/at91_mc.h
+++ b/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
index 42f87caec1..42f87caec1 100644
--- a/include/asm-arm/arch-at91/at91_pdc.h
+++ b/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
index f7915a3322..f7915a3322 100644
--- a/include/asm-arm/arch-at91/at91_pio.h
+++ b/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
index 5615a0206c..5615a0206c 100644
--- a/include/asm-arm/arch-at91/at91_pit.h
+++ b/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
index 5b1a85d051..5b1a85d051 100644
--- a/include/asm-arm/arch-at91/at91_pmc.h
+++ b/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
index 9ff2c5b7ac..9ff2c5b7ac 100644
--- a/include/asm-arm/arch-at91/at91_rstc.h
+++ b/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
index c520e89d2b..c520e89d2b 100644
--- a/include/asm-arm/arch-at91/at91_spi.h
+++ b/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
index 53f932085b..53f932085b 100644
--- a/include/asm-arm/arch-at91/at91_st.h
+++ b/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
index 1e180adb3c..1e180adb3c 100644
--- a/include/asm-arm/arch-at91/at91_tc.h
+++ b/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
index cf08dafdd8..cf08dafdd8 100644
--- a/include/asm-arm/arch-at91/at91_wdt.h
+++ b/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
index 5af6fdc251..5af6fdc251 100644
--- a/include/asm-arm/arch-at91/at91cap9.h
+++ b/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
index 22b7e9b8f4..22b7e9b8f4 100644
--- a/include/asm-arm/arch-at91/at91cap9_matrix.h
+++ b/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
index 1bee6f2b58..1bee6f2b58 100644
--- a/include/asm-arm/arch-at91/at91rm9200.h
+++ b/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
index a60a0811c0..a60a0811c0 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/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
index f8b023d932..f8b023d932 100644
--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
+++ b/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
index 2952292c5d..2952292c5d 100644
--- a/include/asm-arm/arch-at91/at91sam9261.h
+++ b/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
index e2bfc4b0c9..e2bfc4b0c9 100644
--- a/include/asm-arm/arch-at91/at91sam9261_matrix.h
+++ b/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
index c177bd059e..c177bd059e 100644
--- a/include/asm-arm/arch-at91/at91sam9263.h
+++ b/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
index 83aaaab773..83aaaab773 100644
--- a/include/asm-arm/arch-at91/at91sam9263_matrix.h
+++ b/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
index 6d97189d27..6d97189d27 100644
--- a/include/asm-arm/arch-at91/at91sam9_matrix.h
+++ b/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
index c3da3a6a35..c3da3a6a35 100644
--- a/include/asm-arm/arch-at91/at91sam9_sdramc.h
+++ b/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
index d180c8af87..d180c8af87 100644
--- a/include/asm-arm/arch-at91/at91sam9_smc.h
+++ b/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
index 445f4b2123..445f4b2123 100644
--- a/include/asm-arm/arch-at91/at91sam9g45.h
+++ b/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
index 1620e1baff..1620e1baff 100644
--- a/include/asm-arm/arch-at91/at91sam9g45_matrix.h
+++ b/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
index 8eb0d4fa29..8eb0d4fa29 100644
--- a/include/asm-arm/arch-at91/at91sam9rl.h
+++ b/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
index af8d914acc..af8d914acc 100644
--- a/include/asm-arm/arch-at91/at91sam9rl_matrix.h
+++ b/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
index f642dd9958..f642dd9958 100644
--- a/include/asm-arm/arch-at91/clk.h
+++ b/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
index 716f81fa3c..716f81fa3c 100644
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/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
index 4ddb3155d7..4ddb3155d7 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/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
index 38d185eb7c..38d185eb7c 100644
--- a/include/asm-arm/arch-at91/io.h
+++ b/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
index f605f37fd2..f605f37fd2 100644
--- a/include/asm-arm/arch-at91/memory-map.h
+++ b/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
index 00bae1c4d5..00bae1c4d5 100644
--- a/include/asm-arm/arch-at91rm9200/AT91RM9200.h
+++ b/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
index b868e38a3e..b868e38a3e 100644
--- a/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/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
index b0ec8f5090..b0ec8f5090 100644
--- a/include/asm-arm/arch-davinci/emac_defs.h
+++ b/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
index b48ec17e97..b48ec17e97 100644
--- a/include/asm-arm/arch-davinci/emif_defs.h
+++ b/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
index 1be2ac2660..1be2ac2660 100644
--- a/include/asm-arm/arch-davinci/gpio_defs.h
+++ b/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
index 81cc8ab157..81cc8ab157 100644
--- a/include/asm-arm/arch-davinci/hardware.h
+++ b/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
index 24cd268b95..24cd268b95 100644
--- a/include/asm-arm/arch-davinci/i2c_defs.h
+++ b/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
index 10f3a392ab..10f3a392ab 100644
--- a/include/asm-arm/arch-davinci/nand_defs.h
+++ b/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
index 806557a50e..806557a50e 100644
--- a/include/asm-arm/arch-ep93xx/ep93xx.h
+++ b/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
index ec94ba913f..ec94ba913f 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/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
index 2114437dc7..2114437dc7 100644
--- a/include/asm-arm/arch-ixp/ixp425.h
+++ b/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
index 9ea3319d84..9ea3319d84 100644
--- a/include/asm-arm/arch-ixp/ixp425pci.h
+++ b/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
index b3022a3780..b3022a3780 100644
--- a/include/asm-arm/arch-kirkwood/cpu.h
+++ b/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
index cd1bc008ee..cd1bc008ee 100644
--- a/include/asm-arm/arch-kirkwood/gpio.h
+++ b/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
index 2470efbd8c..2470efbd8c 100644
--- a/include/asm-arm/arch-kirkwood/kirkwood.h
+++ b/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
index bbb7ceebba..bbb7ceebba 100644
--- a/include/asm-arm/arch-kirkwood/kw88f6192.h
+++ b/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
index 80723eac54..80723eac54 100644
--- a/include/asm-arm/arch-kirkwood/kw88f6281.h
+++ b/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
index b3c090edcd..b3c090edcd 100644
--- a/include/asm-arm/arch-kirkwood/mpp.h
+++ b/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
index 1d5043f94f..1d5043f94f 100644
--- a/include/asm-arm/arch-kirkwood/spi.h
+++ b/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
index de20015001..de20015001 100644
--- a/include/asm-arm/arch-ks8695/platform.h
+++ b/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
index 5e227e367c..5e227e367c 100644
--- a/include/asm-arm/arch-lpc2292/hardware.h
+++ b/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
index 5715f3ef74..5715f3ef74 100644
--- a/include/asm-arm/arch-lpc2292/lpc2292_registers.h
+++ b/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
index 6ae66e8ba7..6ae66e8ba7 100644
--- a/include/asm-arm/arch-lpc2292/spi.h
+++ b/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
index c59f588570..c59f588570 100644
--- a/include/asm-arm/arch-mx25/clock.h
+++ b/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
index f709bd8e0e..f709bd8e0e 100644
--- a/include/asm-arm/arch-mx25/imx-regs.h
+++ b/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
index a4c658b41b..a4c658b41b 100644
--- a/include/asm-arm/arch-mx25/imx25-pinmux.h
+++ b/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
index 497afe5745..497afe5745 100644
--- a/include/asm-arm/arch-mx27/asm-offsets.h
+++ b/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
index 7e9c7aabb0..7e9c7aabb0 100644
--- a/include/asm-arm/arch-mx27/clock.h
+++ b/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
index d36a6da96d..d36a6da96d 100644
--- a/include/asm-arm/arch-mx27/imx-regs.h
+++ b/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
index 4c83cc7cb7..4c83cc7cb7 100644
--- a/include/asm-arm/arch-mx27/mxcmmc.h
+++ b/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
index 6f6e9a4048..6f6e9a4048 100644
--- a/include/asm-arm/arch-mx31/mx31-regs.h
+++ b/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
index 3cc4b350b6..3cc4b350b6 100644
--- a/include/asm-arm/arch-mx31/mx31.h
+++ b/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
index 3a83fa07a1..3a83fa07a1 100644
--- a/include/asm-arm/arch-mx51/asm-offsets.h
+++ b/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
index 1f8a537a56..1f8a537a56 100644
--- a/include/asm-arm/arch-mx51/clock.h
+++ b/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
index 14aa231a5b..14aa231a5b 100644
--- a/include/asm-arm/arch-mx51/crm_regs.h
+++ b/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
index 3887d3cec4..3887d3cec4 100644
--- a/include/asm-arm/arch-mx51/imx-regs.h
+++ b/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
index a41c387c7c..a41c387c7c 100644
--- a/include/asm-arm/arch-mx51/iomux.h
+++ b/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
index ca26f4166b..ca26f4166b 100644
--- a/include/asm-arm/arch-mx51/mx51_pins.h
+++ b/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
index bf500a8b32..bf500a8b32 100644
--- a/include/asm-arm/arch-mx51/sys_proto.h
+++ b/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
index 1d3c9ce0ab..1d3c9ce0ab 100644
--- a/include/asm-arm/arch-nomadik/gpio.h
+++ b/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
index a87be9ef4f..a87be9ef4f 100644
--- a/include/asm-arm/arch-nomadik/mtu.h
+++ b/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
index f8d92ca120..f8d92ca120 100644
--- a/include/asm-arm/arch-omap/sizes.h
+++ b/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
index 8522335bfc..8522335bfc 100644
--- a/include/asm-arm/arch-omap24xx/bits.h
+++ b/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
index 2e92569a9c..2e92569a9c 100644
--- a/include/asm-arm/arch-omap24xx/clocks.h
+++ b/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
index 19046aaab4..19046aaab4 100644
--- a/include/asm-arm/arch-omap24xx/i2c.h
+++ b/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
index 42e8ab2bce..42e8ab2bce 100644
--- a/include/asm-arm/arch-omap24xx/mem.h
+++ b/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
index 4fdb9c635f..4fdb9c635f 100644
--- a/include/asm-arm/arch-omap24xx/mux.h
+++ b/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
index 0c11beccf6..0c11beccf6 100644
--- a/include/asm-arm/arch-omap24xx/omap2420.h
+++ b/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
index aaba18f150..aaba18f150 100644
--- a/include/asm-arm/arch-omap24xx/sizes.h
+++ b/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
index 53c231a5e4..53c231a5e4 100644
--- a/include/asm-arm/arch-omap24xx/sys_info.h
+++ b/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
index 9d8e5b2622..9d8e5b2622 100644
--- a/include/asm-arm/arch-omap24xx/sys_proto.h
+++ b/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
index 71a0cb6ae4..71a0cb6ae4 100644
--- a/include/asm-arm/arch-omap3/clocks.h
+++ b/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
index 661407b564..661407b564 100644
--- a/include/asm-arm/arch-omap3/clocks_omap3.h
+++ b/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
index aa8de32450..aa8de32450 100644
--- a/include/asm-arm/arch-omap3/cpu.h
+++ b/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
index 30f633ce96..30f633ce96 100644
--- a/include/asm-arm/arch-omap3/gpio.h
+++ b/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
index 490e03bb65..490e03bb65 100644
--- a/include/asm-arm/arch-omap3/i2c.h
+++ b/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
index 9439758e4a..9439758e4a 100644
--- a/include/asm-arm/arch-omap3/mem.h
+++ b/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
index 196ffdcff6..196ffdcff6 100644
--- a/include/asm-arm/arch-omap3/mmc.h
+++ b/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
index aa751c9a34..aa751c9a34 100644
--- a/include/asm-arm/arch-omap3/mmc_host_def.h
+++ b/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
index 0c01c73165..0c01c73165 100644
--- a/include/asm-arm/arch-omap3/mux.h
+++ b/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
index 12815f694f..12815f694f 100644
--- a/include/asm-arm/arch-omap3/omap3.h
+++ b/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
index bd22bce837..bd22bce837 100644
--- a/include/asm-arm/arch-omap3/omap_gpmc.h
+++ b/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
index 34bd515b05..34bd515b05 100644
--- a/include/asm-arm/arch-omap3/sys_proto.h
+++ b/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
index 104a21c2e4..104a21c2e4 100644
--- a/include/asm-arm/arch-pxa/bitfield.h
+++ b/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
index c8c479a186..c8c479a186 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/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
index a25d4c512a..a25d4c512a 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/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
index 61d62707c7..61d62707c7 100644
--- a/include/asm-arm/arch-s3c24x0/memory.h
+++ b/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
index 2678be1548..2678be1548 100644
--- a/include/asm-arm/arch-s3c24x0/s3c2400.h
+++ b/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
index 0543fe1565..0543fe1565 100644
--- a/include/asm-arm/arch-s3c24x0/s3c2410.h
+++ b/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
index 15f53dd35b..15f53dd35b 100644
--- a/include/asm-arm/arch-s3c24x0/s3c24x0.h
+++ b/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
index c37d4a108d..c37d4a108d 100644
--- a/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h
+++ b/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
index 146e265d9a..146e265d9a 100644
--- a/include/asm-arm/arch-s3c44b0/hardware.h
+++ b/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
index 6b8c8edd7a..6b8c8edd7a 100644
--- a/include/asm-arm/arch-s3c4510b/hardware.h
+++ b/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
index 84d24c9384..84d24c9384 100644
--- a/include/asm-arm/arch-s3c64xx/hardware.h
+++ b/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
index 10b33241e1..10b33241e1 100644
--- a/include/asm-arm/arch-s3c64xx/s3c6400.h
+++ b/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
index 0bbf1d0c43..0bbf1d0c43 100644
--- a/include/asm-arm/arch-s3c64xx/s3c64x0.h
+++ b/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
index 3e59abe78c..3e59abe78c 100644
--- a/include/asm-arm/arch-s5pc1xx/clk.h
+++ b/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
index 7b4eb89905..7b4eb89905 100644
--- a/include/asm-arm/arch-s5pc1xx/clock.h
+++ b/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
index 90485aaff2..90485aaff2 100644
--- a/include/asm-arm/arch-s5pc1xx/cpu.h
+++ b/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
index 8e4bb863f9..8e4bb863f9 100644
--- a/include/asm-arm/arch-s5pc1xx/gpio.h
+++ b/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
index 57e2a2ba19..57e2a2ba19 100644
--- a/include/asm-arm/arch-s5pc1xx/power.h
+++ b/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
index e02a8d8fb3..e02a8d8fb3 100644
--- a/include/asm-arm/arch-s5pc1xx/pwm.h
+++ b/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
index 88f4ffe33a..88f4ffe33a 100644
--- a/include/asm-arm/arch-s5pc1xx/smc.h
+++ b/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
index 3078aafd7f..3078aafd7f 100644
--- a/include/asm-arm/arch-s5pc1xx/sys_proto.h
+++ b/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
index 140dbdc45f..140dbdc45f 100644
--- a/include/asm-arm/arch-s5pc1xx/uart.h
+++ b/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
index 104a21c2e4..104a21c2e4 100644
--- a/include/asm-arm/arch-sa1100/bitfield.h
+++ b/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
index 818f36cc66..818f36cc66 100644
--- a/include/asm-arm/arch-spear/hardware.h
+++ b/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
index fa8412ccfc..fa8412ccfc 100644
--- a/include/asm-arm/arch-spear/spr_defs.h
+++ b/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
index c1f1c2aff1..c1f1c2aff1 100644
--- a/include/asm-arm/arch-spear/spr_emi.h
+++ b/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
index 965b5abb9a..965b5abb9a 100644
--- a/include/asm-arm/arch-spear/spr_gpt.h
+++ b/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
index 7521ebc6cf..7521ebc6cf 100644
--- a/include/asm-arm/arch-spear/spr_i2c.h
+++ b/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
index 8b96d9b52a..8b96d9b52a 100644
--- a/include/asm-arm/arch-spear/spr_misc.h
+++ b/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
index 2b63dc7e8e..2b63dc7e8e 100644
--- a/include/asm-arm/arch-spear/spr_nand.h
+++ b/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
index 06df74557f..06df74557f 100644
--- a/include/asm-arm/arch-spear/spr_smi.h
+++ b/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
index 3c92f094cf..3c92f094cf 100644
--- a/include/asm-arm/arch-spear/spr_syscntl.h
+++ b/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
index 7e3da18578..7e3da18578 100644
--- a/include/asm-arm/arch-spear/spr_xloader_table.h
+++ b/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
index ba9e4b72d8..ba9e4b72d8 100644
--- a/include/asm-arm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h
index 270f163eee..270f163eee 100644
--- a/include/asm-arm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h
index c3489f1e1f..c3489f1e1f 100644
--- a/include/asm-arm/byteorder.h
+++ b/arch/arm/include/asm/byteorder.h
diff --git a/include/asm-arm/cache.h b/arch/arm/include/asm/cache.h
index d0518be28c..d0518be28c 100644
--- a/include/asm-arm/cache.h
+++ b/arch/arm/include/asm/cache.h
diff --git a/include/asm-arm/config.h b/arch/arm/include/asm/config.h
index b76fd8eb48..b76fd8eb48 100644
--- a/include/asm-arm/config.h
+++ b/arch/arm/include/asm/config.h
diff --git a/include/asm-arm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 501ce0e680..501ce0e680 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
diff --git a/include/asm-arm/errno.h b/arch/arm/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-arm/errno.h
+++ b/arch/arm/include/asm/errno.h
diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h
index 02cfe4584a..02cfe4584a 100644
--- a/include/asm-arm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h
index 1fd1a5b650..1fd1a5b650 100644
--- a/include/asm-arm/hardware.h
+++ b/arch/arm/include/asm/hardware.h
diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h
index 0a4b5be715..0a4b5be715 100644
--- a/include/asm-arm/io.h
+++ b/arch/arm/include/asm/io.h
diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h
index 4622557b57..4622557b57 100644
--- a/include/asm-arm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
diff --git a/include/asm-arm/macro.h b/arch/arm/include/asm/macro.h
index 57b5260658..57b5260658 100644
--- a/include/asm-arm/macro.h
+++ b/arch/arm/include/asm/macro.h
diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h
index c3b2afd907..c3b2afd907 100644
--- a/include/asm-arm/memory.h
+++ b/arch/arm/include/asm/memory.h
diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h
index c412486db5..c412486db5 100644
--- a/include/asm-arm/posix_types.h
+++ b/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
index aadc83187d..aadc83187d 100644
--- a/include/asm-arm/proc-armv/domain.h
+++ b/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
index 5bfab7fb90..5bfab7fb90 100644
--- a/include/asm-arm/proc-armv/processor.h
+++ b/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
index 79cc6443f4..79cc6443f4 100644
--- a/include/asm-arm/proc-armv/ptrace.h
+++ b/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
index b4cfa68ca3..b4cfa68ca3 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/arch/arm/include/asm/proc-armv/system.h
diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h
index 445d4495be..445d4495be 100644
--- a/include/asm-arm/processor.h
+++ b/arch/arm/include/asm/processor.h
diff --git a/include/asm-arm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 73c9087b50..73c9087b50 100644
--- a/include/asm-arm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h
index 89df4dc708..89df4dc708 100644
--- a/include/asm-arm/setup.h
+++ b/arch/arm/include/asm/setup.h
diff --git a/include/asm-arm/sizes.h b/arch/arm/include/asm/sizes.h
index f8d92ca120..f8d92ca120 100644
--- a/include/asm-arm/sizes.h
+++ b/arch/arm/include/asm/sizes.h
diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h
index c3ea582cab..c3ea582cab 100644
--- a/include/asm-arm/string.h
+++ b/arch/arm/include/asm/string.h
diff --git a/include/asm-arm/system.h b/arch/arm/include/asm/system.h
index 2b28a261ba..2b28a261ba 100644
--- a/include/asm-arm/system.h
+++ b/arch/arm/include/asm/system.h
diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h
index 71dc049da6..71dc049da6 100644
--- a/include/asm-arm/types.h
+++ b/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
index 6d2f8bccb5..6d2f8bccb5 100644
--- a/include/asm-arm/u-boot-arm.h
+++ b/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
index cfd5a9ba45..cfd5a9ba45 100644
--- a/include/asm-arm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
diff --git a/include/asm-arm/unaligned.h b/arch/arm/include/asm/unaligned.h
index 44593a8949..44593a8949 100644
--- a/include/asm-arm/unaligned.h
+++ b/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
index 409eee3536..409eee3536 100644
--- a/include/asm-avr32/arch-at32ap700x/addrspace.h
+++ b/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
index 929f68e1a0..929f68e1a0 100644
--- a/include/asm-avr32/arch-at32ap700x/cacheflush.h
+++ b/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
index 40a2476c9a..40a2476c9a 100644
--- a/include/asm-avr32/arch-at32ap700x/chip-features.h
+++ b/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
index 7a0b6559e0..7a0b6559e0 100644
--- a/include/asm-avr32/arch-at32ap700x/clk.h
+++ b/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
index 8801bd006c..8801bd006c 100644
--- a/include/asm-avr32/arch-at32ap700x/gpio-impl.h
+++ b/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
index 303e35313a..303e35313a 100644
--- a/include/asm-avr32/arch-at32ap700x/gpio.h
+++ b/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
index d6b626328d..d6b626328d 100644
--- a/include/asm-avr32/arch-at32ap700x/hmatrix.h
+++ b/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
index 6592c039fa..6592c039fa 100644
--- a/include/asm-avr32/arch-at32ap700x/memory-map.h
+++ b/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
index 1ba52e5ddb..1ba52e5ddb 100644
--- a/include/asm-avr32/arch-at32ap700x/portmux.h
+++ b/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
index 1306cbe5dc..1306cbe5dc 100644
--- a/include/asm-avr32/arch-common/portmux-gpio.h
+++ b/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
index 1abe5be25f..1abe5be25f 100644
--- a/include/asm-avr32/arch-common/portmux-pio.h
+++ b/arch/avr32/include/asm/arch-common/portmux-pio.h
diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h
index f15fd4647e..f15fd4647e 100644
--- a/include/asm-avr32/bitops.h
+++ b/arch/avr32/include/asm/bitops.h
diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h
index 2fe867e978..2fe867e978 100644
--- a/include/asm-avr32/byteorder.h
+++ b/arch/avr32/include/asm/byteorder.h
diff --git a/include/asm-avr32/config.h b/arch/avr32/include/asm/config.h
index 049c44eaf8..049c44eaf8 100644
--- a/include/asm-avr32/config.h
+++ b/arch/avr32/include/asm/config.h
diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h
index 0be7804da3..0be7804da3 100644
--- a/include/asm-avr32/dma-mapping.h
+++ b/arch/avr32/include/asm/dma-mapping.h
diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-avr32/errno.h
+++ b/arch/avr32/include/asm/errno.h
diff --git a/include/asm-avr32/global_data.h b/arch/avr32/include/asm/global_data.h
index efbdda9ba4..efbdda9ba4 100644
--- a/include/asm-avr32/global_data.h
+++ b/arch/avr32/include/asm/global_data.h
diff --git a/include/asm-avr32/hmatrix-common.h b/arch/avr32/include/asm/hmatrix-common.h
index 4b7e6105dd..4b7e6105dd 100644
--- a/include/asm-avr32/hmatrix-common.h
+++ b/arch/avr32/include/asm/hmatrix-common.h
diff --git a/include/asm-avr32/initcalls.h b/arch/avr32/include/asm/initcalls.h
index 57a278b6a1..57a278b6a1 100644
--- a/include/asm-avr32/initcalls.h
+++ b/arch/avr32/include/asm/initcalls.h
diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h
index 1cb17ead3f..1cb17ead3f 100644
--- a/include/asm-avr32/io.h
+++ b/arch/avr32/include/asm/io.h
diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h
index edf1bc14d2..edf1bc14d2 100644
--- a/include/asm-avr32/posix_types.h
+++ b/arch/avr32/include/asm/posix_types.h
diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h
index cc59dfad56..cc59dfad56 100644
--- a/include/asm-avr32/processor.h
+++ b/arch/avr32/include/asm/processor.h
diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h
index c770ba02c3..c770ba02c3 100644
--- a/include/asm-avr32/ptrace.h
+++ b/arch/avr32/include/asm/ptrace.h
diff --git a/include/asm-avr32/sdram.h b/arch/avr32/include/asm/sdram.h
index 762acfa078..762acfa078 100644
--- a/include/asm-avr32/sdram.h
+++ b/arch/avr32/include/asm/sdram.h
diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h
index fe819b2db6..fe819b2db6 100644
--- a/include/asm-avr32/sections.h
+++ b/arch/avr32/include/asm/sections.h
diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h
index e6ef8d6b50..e6ef8d6b50 100644
--- a/include/asm-avr32/setup.h
+++ b/arch/avr32/include/asm/setup.h
diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h
index 58582a3115..58582a3115 100644
--- a/include/asm-avr32/string.h
+++ b/arch/avr32/include/asm/string.h
diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h
index 4f6970448b..4f6970448b 100644
--- a/include/asm-avr32/sysreg.h
+++ b/arch/avr32/include/asm/sysreg.h
diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h
index c303e3c891..c303e3c891 100644
--- a/include/asm-avr32/types.h
+++ b/arch/avr32/include/asm/types.h
diff --git a/include/asm-avr32/u-boot.h b/arch/avr32/include/asm/u-boot.h
index 7e4001fc5d..7e4001fc5d 100644
--- a/include/asm-avr32/u-boot.h
+++ b/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
index 3a79631fcd..3a79631fcd 100644
--- a/include/asm-blackfin/bfin_logo_230x230.h
+++ b/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
index c5b0be96f1..c5b0be96f1 100644
--- a/include/asm-blackfin/bfin_logo_rgb565_230x230.h
+++ b/arch/blackfin/include/asm/bfin_logo_rgb565_230x230.h
diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h
index ab1fea55c8..ab1fea55c8 100644
--- a/include/asm-blackfin/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h
index 204d02b5f3..204d02b5f3 100644
--- a/include/asm-blackfin/blackfin.h
+++ b/arch/blackfin/include/asm/blackfin.h
diff --git a/include/asm-blackfin/blackfin_cdef.h b/arch/blackfin/include/asm/blackfin_cdef.h
index aa03f2ce4d..aa03f2ce4d 100644
--- a/include/asm-blackfin/blackfin_cdef.h
+++ b/arch/blackfin/include/asm/blackfin_cdef.h
diff --git a/include/asm-blackfin/blackfin_def.h b/arch/blackfin/include/asm/blackfin_def.h
index 18372f6a8a..18372f6a8a 100644
--- a/include/asm-blackfin/blackfin_def.h
+++ b/arch/blackfin/include/asm/blackfin_def.h
diff --git a/include/asm-blackfin/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h
index 3fd34b33fe..3fd34b33fe 100644
--- a/include/asm-blackfin/blackfin_local.h
+++ b/arch/blackfin/include/asm/blackfin_local.h
diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h
index a1a52a5c1a..a1a52a5c1a 100644
--- a/include/asm-blackfin/byteorder.h
+++ b/arch/blackfin/include/asm/byteorder.h
diff --git a/include/asm-blackfin/config-pre.h b/arch/blackfin/include/asm/config-pre.h
index 4531519d91..4531519d91 100644
--- a/include/asm-blackfin/config-pre.h
+++ b/arch/blackfin/include/asm/config-pre.h
diff --git a/include/asm-blackfin/config.h b/arch/blackfin/include/asm/config.h
index 7455685057..7455685057 100644
--- a/include/asm-blackfin/config.h
+++ b/arch/blackfin/include/asm/config.h
diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h
index cc21e93a18..cc21e93a18 100644
--- a/include/asm-blackfin/cplb.h
+++ b/arch/blackfin/include/asm/cplb.h
diff --git a/include/asm-blackfin/deferred.h b/arch/blackfin/include/asm/deferred.h
index 82ceda3e4d..82ceda3e4d 100644
--- a/include/asm-blackfin/deferred.h
+++ b/arch/blackfin/include/asm/deferred.h
diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h
index 3af6ad3e71..3af6ad3e71 100644
--- a/include/asm-blackfin/delay.h
+++ b/arch/blackfin/include/asm/delay.h
diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h
index 404144f4f8..404144f4f8 100644
--- a/include/asm-blackfin/entry.h
+++ b/arch/blackfin/include/asm/entry.h
diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-blackfin/errno.h
+++ b/arch/blackfin/include/asm/errno.h
diff --git a/include/asm-blackfin/global_data.h b/arch/blackfin/include/asm/global_data.h
index c7099e6dac..c7099e6dac 100644
--- a/include/asm-blackfin/global_data.h
+++ b/arch/blackfin/include/asm/global_data.h
diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h
index 75244a0731..75244a0731 100644
--- a/include/asm-blackfin/io.h
+++ b/arch/blackfin/include/asm/io.h
diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h
index fbb497c7bd..fbb497c7bd 100644
--- a/include/asm-blackfin/linkage.h
+++ b/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
index f65b439c17..f65b439c17 100644
--- 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
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
index 0b384808ec..0b384808ec 100644
--- 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
diff --git a/include/asm-blackfin/mach-bf527/BF522_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF522_cdef.h
index 987cc862ce..987cc862ce 100644
--- a/include/asm-blackfin/mach-bf527/BF522_cdef.h
+++ b/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
index bc05029aac..bc05029aac 100644
--- a/include/asm-blackfin/mach-bf527/BF522_def.h
+++ b/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
index 390f3dc16e..390f3dc16e 100644
--- a/include/asm-blackfin/mach-bf527/BF523_cdef.h
+++ b/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
index c27fd646b5..c27fd646b5 100644
--- a/include/asm-blackfin/mach-bf527/BF523_def.h
+++ b/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
index 9ec89c66ae..9ec89c66ae 100644
--- a/include/asm-blackfin/mach-bf527/BF524_cdef.h
+++ b/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
index bd6aa8fdb6..bd6aa8fdb6 100644
--- a/include/asm-blackfin/mach-bf527/BF524_def.h
+++ b/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
index 8fe29db07a..8fe29db07a 100644
--- a/include/asm-blackfin/mach-bf527/BF525_cdef.h
+++ b/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
index 5e88b3b468..5e88b3b468 100644
--- a/include/asm-blackfin/mach-bf527/BF525_def.h
+++ b/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
index 943886210b..943886210b 100644
--- a/include/asm-blackfin/mach-bf527/BF526_cdef.h
+++ b/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
index 2644abf197..2644abf197 100644
--- a/include/asm-blackfin/mach-bf527/BF526_def.h
+++ b/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
index fb9b30793d..fb9b30793d 100644
--- a/include/asm-blackfin/mach-bf527/BF527_cdef.h
+++ b/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
index c46c2b0ee8..c46c2b0ee8 100644
--- a/include/asm-blackfin/mach-bf527/BF527_def.h
+++ b/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
index 0fd7e31710..0fd7e31710 100644
--- a/include/asm-blackfin/mach-bf527/anomaly.h
+++ b/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
index 81eca83bce..81eca83bce 100644
--- a/include/asm-blackfin/mach-bf527/def_local.h
+++ b/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
index 8386b4b266..8386b4b266 100644
--- a/include/asm-blackfin/mach-bf527/mem_map.h
+++ b/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
index e6b1df8708..e6b1df8708 100644
--- a/include/asm-blackfin/mach-bf527/ports.h
+++ b/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
index 49a2b2e1ab..49a2b2e1ab 100644
--- a/include/asm-blackfin/mach-bf533/BF531_cdef.h
+++ b/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
index d7278e56ec..d7278e56ec 100644
--- a/include/asm-blackfin/mach-bf533/BF531_def.h
+++ b/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
index 47b48acf15..47b48acf15 100644
--- a/include/asm-blackfin/mach-bf533/BF532_cdef.h
+++ b/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
index 86944d07ee..86944d07ee 100644
--- a/include/asm-blackfin/mach-bf533/BF532_def.h
+++ b/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
index f270d0188e..f270d0188e 100644
--- a/include/asm-blackfin/mach-bf533/BF533_cdef.h
+++ b/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
index 17b5d7f1c4..17b5d7f1c4 100644
--- a/include/asm-blackfin/mach-bf533/BF533_def.h
+++ b/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
index c98747f6fa..c98747f6fa 100644
--- a/include/asm-blackfin/mach-bf533/anomaly.h
+++ b/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
index 14c111f712..14c111f712 100644
--- a/include/asm-blackfin/mach-bf533/def_local.h
+++ b/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
index 512d6df025..512d6df025 100644
--- a/include/asm-blackfin/mach-bf533/ports.h
+++ b/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
index 07008755f0..07008755f0 100644
--- 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
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
index 61ffa148e8..61ffa148e8 100644
--- 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
diff --git a/include/asm-blackfin/mach-bf537/BF534_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF534_cdef.h
index 27842cc954..27842cc954 100644
--- a/include/asm-blackfin/mach-bf537/BF534_cdef.h
+++ b/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
index 5f0437b090..5f0437b090 100644
--- a/include/asm-blackfin/mach-bf537/BF534_def.h
+++ b/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
index d753b5e248..d753b5e248 100644
--- a/include/asm-blackfin/mach-bf537/BF536_cdef.h
+++ b/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
index 810fe91400..810fe91400 100644
--- a/include/asm-blackfin/mach-bf537/BF536_def.h
+++ b/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
index 5eff57d22d..5eff57d22d 100644
--- a/include/asm-blackfin/mach-bf537/BF537_cdef.h
+++ b/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
index 030fa6461a..030fa6461a 100644
--- a/include/asm-blackfin/mach-bf537/BF537_def.h
+++ b/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
index b7f1a3f301..b7f1a3f301 100644
--- a/include/asm-blackfin/mach-bf537/anomaly.h
+++ b/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
index 14c111f712..14c111f712 100644
--- a/include/asm-blackfin/mach-bf537/def_local.h
+++ b/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
index 2f6293409f..2f6293409f 100644
--- a/include/asm-blackfin/mach-bf537/ports.h
+++ b/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
index 51d9cf240a..51d9cf240a 100644
--- 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
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
index f294a850ab..f294a850ab 100644
--- 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
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
index 4c0fdf52bf..4c0fdf52bf 100644
--- 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
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
index 3c14d22d56..3c14d22d56 100644
--- 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
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
index e0f76ae1ef..e0f76ae1ef 100644
--- 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
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
index 0e482792cf..0e482792cf 100644
--- 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
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
index caf2f6fb6d..caf2f6fb6d 100644
--- 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
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
index a92479bc67..a92479bc67 100644
--- 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
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
index af90e4c62e..af90e4c62e 100644
--- 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
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
index 6163eb276f..6163eb276f 100644
--- 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
diff --git a/include/asm-blackfin/mach-bf548/BF541_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF541_cdef.h
index 1b8c79b59d..1b8c79b59d 100644
--- a/include/asm-blackfin/mach-bf548/BF541_cdef.h
+++ b/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
index 1469ac2db7..1469ac2db7 100644
--- a/include/asm-blackfin/mach-bf548/BF541_def.h
+++ b/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
index 306b5f117f..306b5f117f 100644
--- a/include/asm-blackfin/mach-bf548/BF542_cdef.h
+++ b/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
index 1324a136fd..1324a136fd 100644
--- a/include/asm-blackfin/mach-bf548/BF542_def.h
+++ b/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
index 47ef6e17b5..47ef6e17b5 100644
--- a/include/asm-blackfin/mach-bf548/BF544_cdef.h
+++ b/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
index aef6e4858d..aef6e4858d 100644
--- a/include/asm-blackfin/mach-bf548/BF544_def.h
+++ b/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
index 42d041a741..42d041a741 100644
--- a/include/asm-blackfin/mach-bf548/BF547_cdef.h
+++ b/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
index ce7c8804c0..ce7c8804c0 100644
--- a/include/asm-blackfin/mach-bf548/BF547_def.h
+++ b/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
index cf02834e98..cf02834e98 100644
--- a/include/asm-blackfin/mach-bf548/BF548_cdef.h
+++ b/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
index e02e843e57..e02e843e57 100644
--- a/include/asm-blackfin/mach-bf548/BF548_def.h
+++ b/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
index 3514ceff4d..3514ceff4d 100644
--- a/include/asm-blackfin/mach-bf548/BF549_cdef.h
+++ b/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
index a16ff5aaf6..a16ff5aaf6 100644
--- a/include/asm-blackfin/mach-bf548/BF549_def.h
+++ b/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
index 192dd67c23..192dd67c23 100644
--- a/include/asm-blackfin/mach-bf548/anomaly.h
+++ b/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
index 81eca83bce..81eca83bce 100644
--- a/include/asm-blackfin/mach-bf548/def_local.h
+++ b/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
index 4f943977f5..4f943977f5 100644
--- a/include/asm-blackfin/mach-bf548/mem_map.h
+++ b/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
index 50054f3f19..50054f3f19 100644
--- a/include/asm-blackfin/mach-bf548/ports.h
+++ b/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
index e2c165ace3..e2c165ace3 100644
--- a/include/asm-blackfin/mach-bf561/BF561_cdef.h
+++ b/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
index 8534962326..8534962326 100644
--- a/include/asm-blackfin/mach-bf561/BF561_def.h
+++ b/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
index e4aa20c525..e4aa20c525 100644
--- a/include/asm-blackfin/mach-bf561/anomaly.h
+++ b/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
index 597dcecd8f..597dcecd8f 100644
--- a/include/asm-blackfin/mach-bf561/def_local.h
+++ b/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
index 194d4a3eb1..194d4a3eb1 100644
--- a/include/asm-blackfin/mach-bf561/ports.h
+++ b/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
index 43f385021d..43f385021d 100644
--- 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
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
index b4857c3b02..b4857c3b02 100644
--- 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
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
index af17813db8..af17813db8 100644
--- a/include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h
+++ b/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
index 74f5d309c0..74f5d309c0 100644
--- a/include/asm-blackfin/mach-common/ADSP-EDN-core_def.h
+++ b/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
index 2e61b5faae..2e61b5faae 100644
--- a/include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h
+++ b/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
index 24b56b3876..24b56b3876 100644
--- a/include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h
+++ b/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
index f537e93f70..f537e93f70 100644
--- a/include/asm-blackfin/mach-common/bits/bootrom.h
+++ b/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
index 6db4f81826..6db4f81826 100644
--- a/include/asm-blackfin/mach-common/bits/core.h
+++ b/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
index 136313e613..136313e613 100644
--- a/include/asm-blackfin/mach-common/bits/dma.h
+++ b/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
index 7c0c569acf..7c0c569acf 100644
--- a/include/asm-blackfin/mach-common/bits/ebiu.h
+++ b/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
index 7a43bbb1a3..7a43bbb1a3 100644
--- a/include/asm-blackfin/mach-common/bits/emac.h
+++ b/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
index fb1456fc0e..fb1456fc0e 100644
--- a/include/asm-blackfin/mach-common/bits/eppi.h
+++ b/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
index 77f849e8f2..77f849e8f2 100644
--- a/include/asm-blackfin/mach-common/bits/lockbox.h
+++ b/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
index 39998f82aa..39998f82aa 100644
--- a/include/asm-blackfin/mach-common/bits/mpu.h
+++ b/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
index 4e3f1afcfa..4e3f1afcfa 100644
--- a/include/asm-blackfin/mach-common/bits/otp.h
+++ b/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
index 9b61824f18..9b61824f18 100644
--- a/include/asm-blackfin/mach-common/bits/pata.h
+++ b/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
index 9009f26401..9009f26401 100644
--- a/include/asm-blackfin/mach-common/bits/pll.h
+++ b/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
index 9f78a761c4..9f78a761c4 100644
--- a/include/asm-blackfin/mach-common/bits/ports-a.h
+++ b/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
index b81702f09e..b81702f09e 100644
--- a/include/asm-blackfin/mach-common/bits/ports-b.h
+++ b/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
index 3cc665e0ba..3cc665e0ba 100644
--- a/include/asm-blackfin/mach-common/bits/ports-c.h
+++ b/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
index 868c6a01f1..868c6a01f1 100644
--- a/include/asm-blackfin/mach-common/bits/ports-d.h
+++ b/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
index c88b0d0dd4..c88b0d0dd4 100644
--- a/include/asm-blackfin/mach-common/bits/ports-e.h
+++ b/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
index d6af206332..d6af206332 100644
--- a/include/asm-blackfin/mach-common/bits/ports-f.h
+++ b/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
index 09355d333c..09355d333c 100644
--- a/include/asm-blackfin/mach-common/bits/ports-g.h
+++ b/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
index fa3910c6fb..fa3910c6fb 100644
--- a/include/asm-blackfin/mach-common/bits/ports-h.h
+++ b/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
index f176f08af6..f176f08af6 100644
--- a/include/asm-blackfin/mach-common/bits/ports-i.h
+++ b/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
index 924123ecec..924123ecec 100644
--- a/include/asm-blackfin/mach-common/bits/ports-j.h
+++ b/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
index 523f2388e4..523f2388e4 100644
--- a/include/asm-blackfin/mach-common/bits/ppi.h
+++ b/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
index f5a0cdb9d2..f5a0cdb9d2 100644
--- a/include/asm-blackfin/mach-common/bits/rtc.h
+++ b/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
index 8c5dd33f5c..8c5dd33f5c 100644
--- a/include/asm-blackfin/mach-common/bits/sdh.h
+++ b/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
index 869dcb08f5..869dcb08f5 100644
--- a/include/asm-blackfin/mach-common/bits/spi.h
+++ b/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
index 88e7a5d324..88e7a5d324 100644
--- a/include/asm-blackfin/mach-common/bits/sport.h
+++ b/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
index 9513f80c05..9513f80c05 100644
--- a/include/asm-blackfin/mach-common/bits/timer.h
+++ b/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
index 13e2134ab3..13e2134ab3 100644
--- a/include/asm-blackfin/mach-common/bits/trace.h
+++ b/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
index 8fa7d9f3b5..8fa7d9f3b5 100644
--- a/include/asm-blackfin/mach-common/bits/twi.h
+++ b/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
index ac1ba11f5a..ac1ba11f5a 100644
--- a/include/asm-blackfin/mach-common/bits/uart.h
+++ b/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
index c6390589bc..c6390589bc 100644
--- a/include/asm-blackfin/mach-common/bits/usb.h
+++ b/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
index 75924f92f9..75924f92f9 100644
--- a/include/asm-blackfin/mach-common/bits/watchdog.h
+++ b/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
index 3e361d614a..3e361d614a 100644
--- a/include/asm-blackfin/mem_map.h
+++ b/arch/blackfin/include/asm/mem_map.h
diff --git a/include/asm-blackfin/net.h b/arch/blackfin/include/asm/net.h
index 97cb46691e..97cb46691e 100644
--- a/include/asm-blackfin/net.h
+++ b/arch/blackfin/include/asm/net.h
diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h
index 000ffe52ca..000ffe52ca 100644
--- a/include/asm-blackfin/posix_types.h
+++ b/arch/blackfin/include/asm/posix_types.h
diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h
index d700ccef2f..d700ccef2f 100644
--- a/include/asm-blackfin/processor.h
+++ b/arch/blackfin/include/asm/processor.h
diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h
index 251d5e60c8..251d5e60c8 100644
--- a/include/asm-blackfin/ptrace.h
+++ b/arch/blackfin/include/asm/ptrace.h
diff --git a/include/asm-blackfin/sdh.h b/arch/blackfin/include/asm/sdh.h
index 2c2f63ed55..2c2f63ed55 100644
--- a/include/asm-blackfin/sdh.h
+++ b/arch/blackfin/include/asm/sdh.h
diff --git a/include/asm-blackfin/shared_resources.h b/arch/blackfin/include/asm/shared_resources.h
index 2ac8990693..2ac8990693 100644
--- a/include/asm-blackfin/shared_resources.h
+++ b/arch/blackfin/include/asm/shared_resources.h
diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h
index 7b1573ce19..7b1573ce19 100644
--- a/include/asm-blackfin/signal.h
+++ b/arch/blackfin/include/asm/signal.h
diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h
index 117f44c4d3..117f44c4d3 100644
--- a/include/asm-blackfin/string.h
+++ b/arch/blackfin/include/asm/string.h
diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h
index 6bc7208cad..6bc7208cad 100644
--- a/include/asm-blackfin/system.h
+++ b/arch/blackfin/include/asm/system.h
diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h
index 7422d3d1be..7422d3d1be 100644
--- a/include/asm-blackfin/traps.h
+++ b/arch/blackfin/include/asm/traps.h
diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h
index 2160ba0d02..2160ba0d02 100644
--- a/include/asm-blackfin/types.h
+++ b/arch/blackfin/include/asm/types.h
diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h
index a6e6cf0f54..a6e6cf0f54 100644
--- a/include/asm-blackfin/u-boot.h
+++ b/arch/blackfin/include/asm/u-boot.h
diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h
index 6cecbbb211..6cecbbb211 100644
--- a/include/asm-blackfin/unaligned.h
+++ b/arch/blackfin/include/asm/unaligned.h
diff --git a/include/asm-i386/bitops.h b/arch/i386/include/asm/bitops.h
index c7a38f237a..c7a38f237a 100644
--- a/include/asm-i386/bitops.h
+++ b/arch/i386/include/asm/bitops.h
diff --git a/include/asm-i386/byteorder.h b/arch/i386/include/asm/byteorder.h
index 7dfeb8bbed..7dfeb8bbed 100644
--- a/include/asm-i386/byteorder.h
+++ b/arch/i386/include/asm/byteorder.h
diff --git a/include/asm-i386/config.h b/arch/i386/include/asm/config.h
index 049c44eaf8..049c44eaf8 100644
--- a/include/asm-i386/config.h
+++ b/arch/i386/include/asm/config.h
diff --git a/include/asm-i386/errno.h b/arch/i386/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-i386/errno.h
+++ b/arch/i386/include/asm/errno.h
diff --git a/include/asm-i386/global_data.h b/arch/i386/include/asm/global_data.h
index 3abbf1dba2..3abbf1dba2 100644
--- a/include/asm-i386/global_data.h
+++ b/arch/i386/include/asm/global_data.h
diff --git a/include/asm-i386/i8254.h b/arch/i386/include/asm/i8254.h
index aafdfb8060..aafdfb8060 100644
--- a/include/asm-i386/i8254.h
+++ b/arch/i386/include/asm/i8254.h
diff --git a/include/asm-i386/i8259.h b/arch/i386/include/asm/i8259.h
index 774d7a31e7..774d7a31e7 100644
--- a/include/asm-i386/i8259.h
+++ b/arch/i386/include/asm/i8259.h
diff --git a/include/asm-i386/ibmpc.h b/arch/i386/include/asm/ibmpc.h
index e35cbd887a..e35cbd887a 100644
--- a/include/asm-i386/ibmpc.h
+++ b/arch/i386/include/asm/ibmpc.h
diff --git a/include/asm-i386/ic/pci.h b/arch/i386/include/asm/ic/pci.h
index bcccdbef82..bcccdbef82 100644
--- a/include/asm-i386/ic/pci.h
+++ b/arch/i386/include/asm/ic/pci.h
diff --git a/include/asm-i386/ic/sc520.h b/arch/i386/include/asm/ic/sc520.h
index 57c9904422..57c9904422 100644
--- a/include/asm-i386/ic/sc520.h
+++ b/arch/i386/include/asm/ic/sc520.h
diff --git a/include/asm-i386/ic/ssi.h b/arch/i386/include/asm/ic/ssi.h
index bd48eab161..bd48eab161 100644
--- a/include/asm-i386/ic/ssi.h
+++ b/arch/i386/include/asm/ic/ssi.h
diff --git a/include/asm-i386/interrupt.h b/arch/i386/include/asm/interrupt.h
index 8d324d9f37..8d324d9f37 100644
--- a/include/asm-i386/interrupt.h
+++ b/arch/i386/include/asm/interrupt.h
diff --git a/include/asm-i386/io.h b/arch/i386/include/asm/io.h
index 9b757d489e..9b757d489e 100644
--- a/include/asm-i386/io.h
+++ b/arch/i386/include/asm/io.h
diff --git a/include/asm-i386/pci.h b/arch/i386/include/asm/pci.h
index 050a2bb868..050a2bb868 100644
--- a/include/asm-i386/pci.h
+++ b/arch/i386/include/asm/pci.h
diff --git a/include/asm-i386/posix_types.h b/arch/i386/include/asm/posix_types.h
index 5529f32702..5529f32702 100644
--- a/include/asm-i386/posix_types.h
+++ b/arch/i386/include/asm/posix_types.h
diff --git a/include/asm-i386/processor.h b/arch/i386/include/asm/processor.h
index 5dedba82ca..5dedba82ca 100644
--- a/include/asm-i386/processor.h
+++ b/arch/i386/include/asm/processor.h
diff --git a/include/asm-i386/ptrace.h b/arch/i386/include/asm/ptrace.h
index 750e40d030..750e40d030 100644
--- a/include/asm-i386/ptrace.h
+++ b/arch/i386/include/asm/ptrace.h
diff --git a/include/asm-i386/realmode.h b/arch/i386/include/asm/realmode.h
index 9177e4ec0d..9177e4ec0d 100644
--- a/include/asm-i386/realmode.h
+++ b/arch/i386/include/asm/realmode.h
diff --git a/include/asm-i386/string.h b/arch/i386/include/asm/string.h
index 3643a79fdf..3643a79fdf 100644
--- a/include/asm-i386/string.h
+++ b/arch/i386/include/asm/string.h
diff --git a/include/asm-i386/types.h b/arch/i386/include/asm/types.h
index 9a40e383eb..9a40e383eb 100644
--- a/include/asm-i386/types.h
+++ b/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
index a08632d2d3..a08632d2d3 100644
--- a/include/asm-i386/u-boot-i386.h
+++ b/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
index 9a1eec0cd5..9a1eec0cd5 100644
--- a/include/asm-i386/u-boot.h
+++ b/arch/i386/include/asm/u-boot.h
diff --git a/include/asm-i386/zimage.h b/arch/i386/include/asm/zimage.h
index b6266e456a..b6266e456a 100644
--- a/include/asm-i386/zimage.h
+++ b/arch/i386/include/asm/zimage.h
diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h
index ad971b4f31..ad971b4f31 100644
--- a/include/asm-m68k/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h
index 0e2a0ed8cb..0e2a0ed8cb 100644
--- a/include/asm-m68k/byteorder.h
+++ b/arch/m68k/include/asm/byteorder.h
diff --git a/include/asm-m68k/cache.h b/arch/m68k/include/asm/cache.h
index 7c84e48471..7c84e48471 100644
--- a/include/asm-m68k/cache.h
+++ b/arch/m68k/include/asm/cache.h
diff --git a/include/asm-m68k/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h
index 3efd03a62a..3efd03a62a 100644
--- a/include/asm-m68k/coldfire/ata.h
+++ b/arch/m68k/include/asm/coldfire/ata.h
diff --git a/include/asm-m68k/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h
index a9c724ce4b..a9c724ce4b 100644
--- a/include/asm-m68k/coldfire/crossbar.h
+++ b/arch/m68k/include/asm/coldfire/crossbar.h
diff --git a/include/asm-m68k/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h
index 02d1409610..02d1409610 100644
--- a/include/asm-m68k/coldfire/dspi.h
+++ b/arch/m68k/include/asm/coldfire/dspi.h
diff --git a/include/asm-m68k/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h
index c88aea6cee..c88aea6cee 100644
--- a/include/asm-m68k/coldfire/edma.h
+++ b/arch/m68k/include/asm/coldfire/edma.h
diff --git a/include/asm-m68k/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h
index 1d1bf63310..1d1bf63310 100644
--- a/include/asm-m68k/coldfire/eport.h
+++ b/arch/m68k/include/asm/coldfire/eport.h
diff --git a/include/asm-m68k/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h
index 51cbbd8b2b..51cbbd8b2b 100644
--- a/include/asm-m68k/coldfire/flexbus.h
+++ b/arch/m68k/include/asm/coldfire/flexbus.h
diff --git a/include/asm-m68k/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h
index cafd44ff49..cafd44ff49 100644
--- a/include/asm-m68k/coldfire/flexcan.h
+++ b/arch/m68k/include/asm/coldfire/flexcan.h
diff --git a/include/asm-m68k/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
index ae82b292b1..ae82b292b1 100644
--- a/include/asm-m68k/coldfire/intctrl.h
+++ b/arch/m68k/include/asm/coldfire/intctrl.h
diff --git a/include/asm-m68k/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h
index 66b95b3823..66b95b3823 100644
--- a/include/asm-m68k/coldfire/lcd.h
+++ b/arch/m68k/include/asm/coldfire/lcd.h
diff --git a/include/asm-m68k/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h
index b698136371..b698136371 100644
--- a/include/asm-m68k/coldfire/mdha.h
+++ b/arch/m68k/include/asm/coldfire/mdha.h
diff --git a/include/asm-m68k/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h
index f737d98c1f..f737d98c1f 100644
--- a/include/asm-m68k/coldfire/pwm.h
+++ b/arch/m68k/include/asm/coldfire/pwm.h
diff --git a/include/asm-m68k/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h
index 8bcd2e4db1..8bcd2e4db1 100644
--- a/include/asm-m68k/coldfire/qspi.h
+++ b/arch/m68k/include/asm/coldfire/qspi.h
diff --git a/include/asm-m68k/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h
index 1eefc56bd4..1eefc56bd4 100644
--- a/include/asm-m68k/coldfire/rng.h
+++ b/arch/m68k/include/asm/coldfire/rng.h
diff --git a/include/asm-m68k/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h
index bd6b5af04b..bd6b5af04b 100644
--- a/include/asm-m68k/coldfire/skha.h
+++ b/arch/m68k/include/asm/coldfire/skha.h
diff --git a/include/asm-m68k/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h
index b3dfbfab6b..b3dfbfab6b 100644
--- a/include/asm-m68k/coldfire/ssi.h
+++ b/arch/m68k/include/asm/coldfire/ssi.h
diff --git a/include/asm-m68k/config.h b/arch/m68k/include/asm/config.h
index 36438be112..36438be112 100644
--- a/include/asm-m68k/config.h
+++ b/arch/m68k/include/asm/config.h
diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-m68k/errno.h
+++ b/arch/m68k/include/asm/errno.h
diff --git a/include/asm-m68k/fec.h b/arch/m68k/include/asm/fec.h
index 49311e596f..49311e596f 100644
--- a/include/asm-m68k/fec.h
+++ b/arch/m68k/include/asm/fec.h
diff --git a/include/asm-m68k/fsl_i2c.h b/arch/m68k/include/asm/fsl_i2c.h
index 2bc9bf434e..2bc9bf434e 100644
--- a/include/asm-m68k/fsl_i2c.h
+++ b/arch/m68k/include/asm/fsl_i2c.h
diff --git a/include/asm-m68k/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h
index 7e540567aa..7e540567aa 100644
--- a/include/asm-m68k/fsl_mcdmafec.h
+++ b/arch/m68k/include/asm/fsl_mcdmafec.h
diff --git a/include/asm-m68k/global_data.h b/arch/m68k/include/asm/global_data.h
index 413c200023..413c200023 100644
--- a/include/asm-m68k/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
diff --git a/include/asm-m68k/immap.h b/arch/m68k/include/asm/immap.h
index e83ce08d57..e83ce08d57 100644
--- a/include/asm-m68k/immap.h
+++ b/arch/m68k/include/asm/immap.h
diff --git a/include/asm-m68k/immap_520x.h b/arch/m68k/include/asm/immap_520x.h
index 08bc1090ce..08bc1090ce 100644
--- a/include/asm-m68k/immap_520x.h
+++ b/arch/m68k/include/asm/immap_520x.h
diff --git a/include/asm-m68k/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h
index 6f65f50307..6f65f50307 100644
--- a/include/asm-m68k/immap_5227x.h
+++ b/arch/m68k/include/asm/immap_5227x.h
diff --git a/include/asm-m68k/immap_5235.h b/arch/m68k/include/asm/immap_5235.h
index f7f35fcb9f..f7f35fcb9f 100644
--- a/include/asm-m68k/immap_5235.h
+++ b/arch/m68k/include/asm/immap_5235.h
diff --git a/include/asm-m68k/immap_5249.h b/arch/m68k/include/asm/immap_5249.h
index 02420869e8..02420869e8 100644
--- a/include/asm-m68k/immap_5249.h
+++ b/arch/m68k/include/asm/immap_5249.h
diff --git a/include/asm-m68k/immap_5253.h b/arch/m68k/include/asm/immap_5253.h
index 28cd107a82..28cd107a82 100644
--- a/include/asm-m68k/immap_5253.h
+++ b/arch/m68k/include/asm/immap_5253.h
diff --git a/include/asm-m68k/immap_5271.h b/arch/m68k/include/asm/immap_5271.h
index 8ddec5c566..8ddec5c566 100644
--- a/include/asm-m68k/immap_5271.h
+++ b/arch/m68k/include/asm/immap_5271.h
diff --git a/include/asm-m68k/immap_5272.h b/arch/m68k/include/asm/immap_5272.h
index 8d4254bcdb..8d4254bcdb 100644
--- a/include/asm-m68k/immap_5272.h
+++ b/arch/m68k/include/asm/immap_5272.h
diff --git a/include/asm-m68k/immap_5275.h b/arch/m68k/include/asm/immap_5275.h
index 46426a33d6..46426a33d6 100644
--- a/include/asm-m68k/immap_5275.h
+++ b/arch/m68k/include/asm/immap_5275.h
diff --git a/include/asm-m68k/immap_5282.h b/arch/m68k/include/asm/immap_5282.h
index dd526a1198..dd526a1198 100644
--- a/include/asm-m68k/immap_5282.h
+++ b/arch/m68k/include/asm/immap_5282.h
diff --git a/include/asm-m68k/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h
index 87ac770cf8..87ac770cf8 100644
--- a/include/asm-m68k/immap_5301x.h
+++ b/arch/m68k/include/asm/immap_5301x.h
diff --git a/include/asm-m68k/immap_5329.h b/arch/m68k/include/asm/immap_5329.h
index 4f255c6a30..4f255c6a30 100644
--- a/include/asm-m68k/immap_5329.h
+++ b/arch/m68k/include/asm/immap_5329.h
diff --git a/include/asm-m68k/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h
index 57cf3ec7da..57cf3ec7da 100644
--- a/include/asm-m68k/immap_5445x.h
+++ b/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
index 50f8b05d98..50f8b05d98 100644
--- a/include/asm-m68k/immap_547x_8x.h
+++ b/arch/m68k/include/asm/immap_547x_8x.h
diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h
index 531f420336..531f420336 100644
--- a/include/asm-m68k/io.h
+++ b/arch/m68k/include/asm/io.h
diff --git a/include/asm-m68k/m520x.h b/arch/m68k/include/asm/m520x.h
index 71f147e751..71f147e751 100644
--- a/include/asm-m68k/m520x.h
+++ b/arch/m68k/include/asm/m520x.h
diff --git a/include/asm-m68k/m5227x.h b/arch/m68k/include/asm/m5227x.h
index c77d5dd657..c77d5dd657 100644
--- a/include/asm-m68k/m5227x.h
+++ b/arch/m68k/include/asm/m5227x.h
diff --git a/include/asm-m68k/m5235.h b/arch/m68k/include/asm/m5235.h
index 71a40d33d2..71a40d33d2 100644
--- a/include/asm-m68k/m5235.h
+++ b/arch/m68k/include/asm/m5235.h
diff --git a/include/asm-m68k/m5249.h b/arch/m68k/include/asm/m5249.h
index fa0cb14dae..fa0cb14dae 100644
--- a/include/asm-m68k/m5249.h
+++ b/arch/m68k/include/asm/m5249.h
diff --git a/include/asm-m68k/m5253.h b/arch/m68k/include/asm/m5253.h
index eda3472738..eda3472738 100644
--- a/include/asm-m68k/m5253.h
+++ b/arch/m68k/include/asm/m5253.h
diff --git a/include/asm-m68k/m5271.h b/arch/m68k/include/asm/m5271.h
index d25261bcd1..d25261bcd1 100644
--- a/include/asm-m68k/m5271.h
+++ b/arch/m68k/include/asm/m5271.h
diff --git a/include/asm-m68k/m5272.h b/arch/m68k/include/asm/m5272.h
index 895f89df74..895f89df74 100644
--- a/include/asm-m68k/m5272.h
+++ b/arch/m68k/include/asm/m5272.h
diff --git a/include/asm-m68k/m5275.h b/arch/m68k/include/asm/m5275.h
index 24dbae2533..24dbae2533 100644
--- a/include/asm-m68k/m5275.h
+++ b/arch/m68k/include/asm/m5275.h
diff --git a/include/asm-m68k/m5282.h b/arch/m68k/include/asm/m5282.h
index d59a8b2c31..d59a8b2c31 100644
--- a/include/asm-m68k/m5282.h
+++ b/arch/m68k/include/asm/m5282.h
diff --git a/include/asm-m68k/m5301x.h b/arch/m68k/include/asm/m5301x.h
index 0920a0dc2a..0920a0dc2a 100644
--- a/include/asm-m68k/m5301x.h
+++ b/arch/m68k/include/asm/m5301x.h
diff --git a/include/asm-m68k/m5329.h b/arch/m68k/include/asm/m5329.h
index c7ebed1375..c7ebed1375 100644
--- a/include/asm-m68k/m5329.h
+++ b/arch/m68k/include/asm/m5329.h
diff --git a/include/asm-m68k/m5445x.h b/arch/m68k/include/asm/m5445x.h
index dfddde62ad..dfddde62ad 100644
--- a/include/asm-m68k/m5445x.h
+++ b/arch/m68k/include/asm/m5445x.h
diff --git a/include/asm-m68k/m547x_8x.h b/arch/m68k/include/asm/m547x_8x.h
index 23cee8e5e4..23cee8e5e4 100644
--- a/include/asm-m68k/m547x_8x.h
+++ b/arch/m68k/include/asm/m547x_8x.h
diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h
index 4fbc0405f7..4fbc0405f7 100644
--- a/include/asm-m68k/posix_types.h
+++ b/arch/m68k/include/asm/posix_types.h
diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h
index 3fafa6ff1a..3fafa6ff1a 100644
--- a/include/asm-m68k/processor.h
+++ b/arch/m68k/include/asm/processor.h
diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h
index 01535beb15..01535beb15 100644
--- a/include/asm-m68k/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h
index 7651ca9325..7651ca9325 100644
--- a/include/asm-m68k/rtc.h
+++ b/arch/m68k/include/asm/rtc.h
diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h
index e0773a8828..e0773a8828 100644
--- a/include/asm-m68k/string.h
+++ b/arch/m68k/include/asm/string.h
diff --git a/include/asm-m68k/timer.h b/arch/m68k/include/asm/timer.h
index 1a5de05871..1a5de05871 100644
--- a/include/asm-m68k/timer.h
+++ b/arch/m68k/include/asm/timer.h
diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h
index 3ffcab20df..3ffcab20df 100644
--- a/include/asm-m68k/types.h
+++ b/arch/m68k/include/asm/types.h
diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h
index a0f2983750..a0f2983750 100644
--- a/include/asm-m68k/u-boot.h
+++ b/arch/m68k/include/asm/u-boot.h
diff --git a/include/asm-m68k/uart.h b/arch/m68k/include/asm/uart.h
index 9a528ea498..9a528ea498 100644
--- a/include/asm-m68k/uart.h
+++ b/arch/m68k/include/asm/uart.h
diff --git a/include/asm-m68k/unaligned.h b/arch/m68k/include/asm/unaligned.h
index 328aa0c316..328aa0c316 100644
--- a/include/asm-m68k/unaligned.h
+++ b/arch/m68k/include/asm/unaligned.h
diff --git a/include/asm-microblaze/asm.h b/arch/microblaze/include/asm/asm.h
index deb23e094a..deb23e094a 100644
--- a/include/asm-microblaze/asm.h
+++ b/arch/microblaze/include/asm/asm.h
diff --git a/include/asm-microblaze/bitops.h b/arch/microblaze/include/asm/bitops.h
index e8c835f7c0..e8c835f7c0 100644
--- a/include/asm-microblaze/bitops.h
+++ b/arch/microblaze/include/asm/bitops.h
diff --git a/include/asm-microblaze/byteorder.h b/arch/microblaze/include/asm/byteorder.h
index a4a75b7a6d..a4a75b7a6d 100644
--- a/include/asm-microblaze/byteorder.h
+++ b/arch/microblaze/include/asm/byteorder.h
diff --git a/include/asm-microblaze/config.h b/arch/microblaze/include/asm/config.h
index 8a9064b3c8..8a9064b3c8 100644
--- a/include/asm-microblaze/config.h
+++ b/arch/microblaze/include/asm/config.h
diff --git a/include/asm-microblaze/errno.h b/arch/microblaze/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-microblaze/errno.h
+++ b/arch/microblaze/include/asm/errno.h
diff --git a/include/asm-microblaze/global_data.h b/arch/microblaze/include/asm/global_data.h
index ec7837f6b9..ec7837f6b9 100644
--- a/include/asm-microblaze/global_data.h
+++ b/arch/microblaze/include/asm/global_data.h
diff --git a/include/asm-microblaze/io.h b/arch/microblaze/include/asm/io.h
index 7e190d15c6..7e190d15c6 100644
--- a/include/asm-microblaze/io.h
+++ b/arch/microblaze/include/asm/io.h
diff --git a/include/asm-microblaze/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h
index 4c385aa24f..4c385aa24f 100644
--- a/include/asm-microblaze/microblaze_intc.h
+++ b/arch/microblaze/include/asm/microblaze_intc.h
diff --git a/include/asm-microblaze/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h
index 844c8db115..844c8db115 100644
--- a/include/asm-microblaze/microblaze_timer.h
+++ b/arch/microblaze/include/asm/microblaze_timer.h
diff --git a/include/asm-microblaze/posix_types.h b/arch/microblaze/include/asm/posix_types.h
index 9a2cc663ec..9a2cc663ec 100644
--- a/include/asm-microblaze/posix_types.h
+++ b/arch/microblaze/include/asm/posix_types.h
diff --git a/include/asm-microblaze/processor.h b/arch/microblaze/include/asm/processor.h
index 78b8976ca3..78b8976ca3 100644
--- a/include/asm-microblaze/processor.h
+++ b/arch/microblaze/include/asm/processor.h
diff --git a/include/asm-microblaze/ptrace.h b/arch/microblaze/include/asm/ptrace.h
index b796d4faf6..b796d4faf6 100644
--- a/include/asm-microblaze/ptrace.h
+++ b/arch/microblaze/include/asm/ptrace.h
diff --git a/include/asm-microblaze/string.h b/arch/microblaze/include/asm/string.h
index 724f5bdfa6..724f5bdfa6 100644
--- a/include/asm-microblaze/string.h
+++ b/arch/microblaze/include/asm/string.h
diff --git a/include/asm-microblaze/system.h b/arch/microblaze/include/asm/system.h
index 0297a11590..0297a11590 100644
--- a/include/asm-microblaze/system.h
+++ b/arch/microblaze/include/asm/system.h
diff --git a/include/asm-microblaze/types.h b/arch/microblaze/include/asm/types.h
index 77094f62d6..77094f62d6 100644
--- a/include/asm-microblaze/types.h
+++ b/arch/microblaze/include/asm/types.h
diff --git a/include/asm-microblaze/u-boot.h b/arch/microblaze/include/asm/u-boot.h
index 543a6b1777..543a6b1777 100644
--- a/include/asm-microblaze/u-boot.h
+++ b/arch/microblaze/include/asm/u-boot.h
diff --git a/include/asm-microblaze/unaligned.h b/arch/microblaze/include/asm/unaligned.h
index 785c2e9157..785c2e9157 100644
--- a/include/asm-microblaze/unaligned.h
+++ b/arch/microblaze/include/asm/unaligned.h
diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h
index 3a1e6d615f..3a1e6d615f 100644
--- a/include/asm-mips/addrspace.h
+++ b/arch/mips/include/asm/addrspace.h
diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h
index 608cfcfbb3..608cfcfbb3 100644
--- a/include/asm-mips/asm.h
+++ b/arch/mips/include/asm/asm.h
diff --git a/include/asm-mips/au1x00.h b/arch/mips/include/asm/au1x00.h
index 2a948e8fe7..2a948e8fe7 100644
--- a/include/asm-mips/au1x00.h
+++ b/arch/mips/include/asm/au1x00.h
diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h
index 1c8f4c0500..1c8f4c0500 100644
--- a/include/asm-mips/bitops.h
+++ b/arch/mips/include/asm/bitops.h
diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h
index b5e685feb6..b5e685feb6 100644
--- a/include/asm-mips/byteorder.h
+++ b/arch/mips/include/asm/byteorder.h
diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h
index f3ce721861..f3ce721861 100644
--- a/include/asm-mips/cachectl.h
+++ b/arch/mips/include/asm/cachectl.h
diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h
index 70bcad7694..70bcad7694 100644
--- a/include/asm-mips/cacheops.h
+++ b/arch/mips/include/asm/cacheops.h
diff --git a/include/asm-mips/config.h b/arch/mips/include/asm/config.h
index 049c44eaf8..049c44eaf8 100644
--- a/include/asm-mips/config.h
+++ b/arch/mips/include/asm/config.h
diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h
index 1665a63a81..1665a63a81 100644
--- a/include/asm-mips/errno.h
+++ b/arch/mips/include/asm/errno.h
diff --git a/include/asm-mips/global_data.h b/arch/mips/include/asm/global_data.h
index b2c4891151..b2c4891151 100644
--- a/include/asm-mips/global_data.h
+++ b/arch/mips/include/asm/global_data.h
diff --git a/include/asm-mips/inca-ip.h b/arch/mips/include/asm/inca-ip.h
index e787a1dee6..e787a1dee6 100644
--- a/include/asm-mips/inca-ip.h
+++ b/arch/mips/include/asm/inca-ip.h
diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h
index 025012ae60..025012ae60 100644
--- a/include/asm-mips/io.h
+++ b/arch/mips/include/asm/io.h
diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h
index 24c6cda793..24c6cda793 100644
--- a/include/asm-mips/isadep.h
+++ b/arch/mips/include/asm/isadep.h
diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index be7e5c65ec..be7e5c65ec 100644
--- a/include/asm-mips/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h
index 879aae210b..879aae210b 100644
--- a/include/asm-mips/posix_types.h
+++ b/arch/mips/include/asm/posix_types.h
diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h
index 24858ddda5..24858ddda5 100644
--- a/include/asm-mips/processor.h
+++ b/arch/mips/include/asm/processor.h
diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h
index 5659c0c873..5659c0c873 100644
--- a/include/asm-mips/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h
index 978d206816..978d206816 100644
--- a/include/asm-mips/reboot.h
+++ b/arch/mips/include/asm/reboot.h
diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h
index fc6bc0c169..fc6bc0c169 100644
--- a/include/asm-mips/reg.h
+++ b/arch/mips/include/asm/reg.h
diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h
index 2e65cc3c43..2e65cc3c43 100644
--- a/include/asm-mips/regdef.h
+++ b/arch/mips/include/asm/regdef.h
diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h
index 67f2658958..67f2658958 100644
--- a/include/asm-mips/sgidefs.h
+++ b/arch/mips/include/asm/sgidefs.h
diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h
index 579a591e62..579a591e62 100644
--- a/include/asm-mips/string.h
+++ b/arch/mips/include/asm/string.h
diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h
index b6d50e2f04..b6d50e2f04 100644
--- a/include/asm-mips/system.h
+++ b/arch/mips/include/asm/system.h
diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h
index d4bb85999b..d4bb85999b 100644
--- a/include/asm-mips/types.h
+++ b/arch/mips/include/asm/types.h
diff --git a/include/asm-mips/u-boot.h b/arch/mips/include/asm/u-boot.h
index d9c14caf4a..d9c14caf4a 100644
--- a/include/asm-mips/u-boot.h
+++ b/arch/mips/include/asm/u-boot.h
diff --git a/include/asm-mips/unaligned.h b/arch/mips/include/asm/unaligned.h
index 1d5112ea69..1d5112ea69 100644
--- a/include/asm-mips/unaligned.h
+++ b/arch/mips/include/asm/unaligned.h
diff --git a/include/asm-nios/bitops.h b/arch/nios/include/asm/bitops.h
index 0be74f42b8..0be74f42b8 100644
--- a/include/asm-nios/bitops.h
+++ b/arch/nios/include/asm/bitops.h
diff --git a/include/asm-nios/byteorder.h b/arch/nios/include/asm/byteorder.h
index dc7102115f..dc7102115f 100644
--- a/include/asm-nios/byteorder.h
+++ b/arch/nios/include/asm/byteorder.h
diff --git a/include/asm-nios/cache.h b/arch/nios/include/asm/cache.h
index 3cdb7039ff..3cdb7039ff 100644
--- a/include/asm-nios/cache.h
+++ b/arch/nios/include/asm/cache.h
diff --git a/include/asm-nios/config.h b/arch/nios/include/asm/config.h
index 2efe898b35..2efe898b35 100644
--- a/include/asm-nios/config.h
+++ b/arch/nios/include/asm/config.h
diff --git a/include/asm-nios/global_data.h b/arch/nios/include/asm/global_data.h
index fa54ee4dd3..fa54ee4dd3 100644
--- a/include/asm-nios/global_data.h
+++ b/arch/nios/include/asm/global_data.h
diff --git a/include/asm-nios/io.h b/arch/nios/include/asm/io.h
index 899682cc40..899682cc40 100644
--- a/include/asm-nios/io.h
+++ b/arch/nios/include/asm/io.h
diff --git a/include/asm-nios/posix_types.h b/arch/nios/include/asm/posix_types.h
index eb7421489f..eb7421489f 100644
--- a/include/asm-nios/posix_types.h
+++ b/arch/nios/include/asm/posix_types.h
diff --git a/include/asm-nios/processor.h b/arch/nios/include/asm/processor.h
index 78b8976ca3..78b8976ca3 100644
--- a/include/asm-nios/processor.h
+++ b/arch/nios/include/asm/processor.h
diff --git a/include/asm-nios/psr.h b/arch/nios/include/asm/psr.h
index 6e8eba8095..6e8eba8095 100644
--- a/include/asm-nios/psr.h
+++ b/arch/nios/include/asm/psr.h
diff --git a/include/asm-nios/ptrace.h b/arch/nios/include/asm/ptrace.h
index 73754c8696..73754c8696 100644
--- a/include/asm-nios/ptrace.h
+++ b/arch/nios/include/asm/ptrace.h
diff --git a/include/asm-nios/status_led.h b/arch/nios/include/asm/status_led.h
index 241c917688..241c917688 100644
--- a/include/asm-nios/status_led.h
+++ b/arch/nios/include/asm/status_led.h
diff --git a/include/asm-nios/string.h b/arch/nios/include/asm/string.h
index fa33275010..fa33275010 100644
--- a/include/asm-nios/string.h
+++ b/arch/nios/include/asm/string.h
diff --git a/include/asm-nios/system.h b/arch/nios/include/asm/system.h
index 9a9383d161..9a9383d161 100644
--- a/include/asm-nios/system.h
+++ b/arch/nios/include/asm/system.h
diff --git a/include/asm-nios/types.h b/arch/nios/include/asm/types.h
index 636e12fd38..636e12fd38 100644
--- a/include/asm-nios/types.h
+++ b/arch/nios/include/asm/types.h
diff --git a/include/asm-nios/u-boot.h b/arch/nios/include/asm/u-boot.h
index bdb6cf21b6..bdb6cf21b6 100644
--- a/include/asm-nios/u-boot.h
+++ b/arch/nios/include/asm/u-boot.h
diff --git a/include/asm-nios2/bitops.h b/arch/nios2/include/asm/bitops.h
index cf48ff7a1a..cf48ff7a1a 100644
--- a/include/asm-nios2/bitops.h
+++ b/arch/nios2/include/asm/bitops.h
diff --git a/include/asm-nios2/bitops/atomic.h b/arch/nios2/include/asm/bitops/atomic.h
index c8946465e6..c8946465e6 100644
--- a/include/asm-nios2/bitops/atomic.h
+++ b/arch/nios2/include/asm/bitops/atomic.h
diff --git a/include/asm-nios2/bitops/ffs.h b/arch/nios2/include/asm/bitops/ffs.h
index fbbb43af7d..fbbb43af7d 100644
--- a/include/asm-nios2/bitops/ffs.h
+++ b/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
index 697cc2b7e0..697cc2b7e0 100644
--- a/include/asm-nios2/bitops/non-atomic.h
+++ b/arch/nios2/include/asm/bitops/non-atomic.h
diff --git a/include/asm-nios2/byteorder.h b/arch/nios2/include/asm/byteorder.h
index 495c823af2..495c823af2 100644
--- a/include/asm-nios2/byteorder.h
+++ b/arch/nios2/include/asm/byteorder.h
diff --git a/include/asm-nios2/cache.h b/arch/nios2/include/asm/cache.h
index c78f34308b..c78f34308b 100644
--- a/include/asm-nios2/cache.h
+++ b/arch/nios2/include/asm/cache.h
diff --git a/include/asm-nios2/config.h b/arch/nios2/include/asm/config.h
index 011d603a4b..011d603a4b 100644
--- a/include/asm-nios2/config.h
+++ b/arch/nios2/include/asm/config.h
diff --git a/include/asm-nios2/errno.h b/arch/nios2/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-nios2/errno.h
+++ b/arch/nios2/include/asm/errno.h
diff --git a/include/asm-nios2/global_data.h b/arch/nios2/include/asm/global_data.h
index 34aa96277a..34aa96277a 100644
--- a/include/asm-nios2/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
diff --git a/include/asm-nios2/io.h b/arch/nios2/include/asm/io.h
index 121405cd60..121405cd60 100644
--- a/include/asm-nios2/io.h
+++ b/arch/nios2/include/asm/io.h
diff --git a/include/asm-nios2/opcodes.h b/arch/nios2/include/asm/opcodes.h
index 211f8ba9dd..211f8ba9dd 100644
--- a/include/asm-nios2/opcodes.h
+++ b/arch/nios2/include/asm/opcodes.h
diff --git a/include/asm-nios2/posix_types.h b/arch/nios2/include/asm/posix_types.h
index c2deea6bf7..c2deea6bf7 100644
--- a/include/asm-nios2/posix_types.h
+++ b/arch/nios2/include/asm/posix_types.h
diff --git a/include/asm-nios2/processor.h b/arch/nios2/include/asm/processor.h
index 68502a5303..68502a5303 100644
--- a/include/asm-nios2/processor.h
+++ b/arch/nios2/include/asm/processor.h
diff --git a/include/asm-nios2/psr.h b/arch/nios2/include/asm/psr.h
index a498b46cf3..a498b46cf3 100644
--- a/include/asm-nios2/psr.h
+++ b/arch/nios2/include/asm/psr.h
diff --git a/include/asm-nios2/ptrace.h b/arch/nios2/include/asm/ptrace.h
index 5430880142..5430880142 100644
--- a/include/asm-nios2/ptrace.h
+++ b/arch/nios2/include/asm/ptrace.h
diff --git a/include/asm-nios2/status_led.h b/arch/nios2/include/asm/status_led.h
index 20f8d90195..20f8d90195 100644
--- a/include/asm-nios2/status_led.h
+++ b/arch/nios2/include/asm/status_led.h
diff --git a/include/asm-nios2/string.h b/arch/nios2/include/asm/string.h
index e86490354f..e86490354f 100644
--- a/include/asm-nios2/string.h
+++ b/arch/nios2/include/asm/string.h
diff --git a/include/asm-nios2/system.h b/arch/nios2/include/asm/system.h
index bb03ca5316..bb03ca5316 100644
--- a/include/asm-nios2/system.h
+++ b/arch/nios2/include/asm/system.h
diff --git a/include/asm-nios2/types.h b/arch/nios2/include/asm/types.h
index ea859c0774..ea859c0774 100644
--- a/include/asm-nios2/types.h
+++ b/arch/nios2/include/asm/types.h
diff --git a/include/asm-nios2/u-boot.h b/arch/nios2/include/asm/u-boot.h
index ec844d0401..ec844d0401 100644
--- a/include/asm-nios2/u-boot.h
+++ b/arch/nios2/include/asm/u-boot.h
diff --git a/include/asm-nios2/unaligned.h b/arch/nios2/include/asm/unaligned.h
index 779117c4bc..779117c4bc 100644
--- a/include/asm-nios2/unaligned.h
+++ b/arch/nios2/include/asm/unaligned.h
diff --git a/include/asm-ppc/4xx_pci.h b/arch/ppc/include/asm/4xx_pci.h
index f686e7cb07..f686e7cb07 100644
--- a/include/asm-ppc/4xx_pci.h
+++ b/arch/ppc/include/asm/4xx_pci.h
diff --git a/include/asm-ppc/4xx_pcie.h b/arch/ppc/include/asm/4xx_pcie.h
index a0e88de11d..a0e88de11d 100644
--- a/include/asm-ppc/4xx_pcie.h
+++ b/arch/ppc/include/asm/4xx_pcie.h
diff --git a/include/asm-ppc/5xx_immap.h b/arch/ppc/include/asm/5xx_immap.h
index 72cbab43e4..72cbab43e4 100644
--- a/include/asm-ppc/5xx_immap.h
+++ b/arch/ppc/include/asm/5xx_immap.h
diff --git a/include/asm-ppc/8xx_immap.h b/arch/ppc/include/asm/8xx_immap.h
index 40679cb2b0..40679cb2b0 100644
--- a/include/asm-ppc/8xx_immap.h
+++ b/arch/ppc/include/asm/8xx_immap.h
diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h
index 23f22df1b7..23f22df1b7 100644
--- a/include/asm-ppc/atomic.h
+++ b/arch/ppc/include/asm/atomic.h
diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h
index adaf091492..adaf091492 100644
--- a/include/asm-ppc/bitops.h
+++ b/arch/ppc/include/asm/bitops.h
diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h
index 3f5bcf63a1..3f5bcf63a1 100644
--- a/include/asm-ppc/byteorder.h
+++ b/arch/ppc/include/asm/byteorder.h
diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h
index 53e8d05f50..53e8d05f50 100644
--- a/include/asm-ppc/cache.h
+++ b/arch/ppc/include/asm/cache.h
diff --git a/include/asm-ppc/config.h b/arch/ppc/include/asm/config.h
index fc3facb307..fc3facb307 100644
--- a/include/asm-ppc/config.h
+++ b/arch/ppc/include/asm/config.h
diff --git a/include/asm-ppc/cpm_8260.h b/arch/ppc/include/asm/cpm_8260.h
index 8302404abb..8302404abb 100644
--- a/include/asm-ppc/cpm_8260.h
+++ b/arch/ppc/include/asm/cpm_8260.h
diff --git a/include/asm-ppc/cpm_85xx.h b/arch/ppc/include/asm/cpm_85xx.h
index a74a3a115b..a74a3a115b 100644
--- a/include/asm-ppc/cpm_85xx.h
+++ b/arch/ppc/include/asm/cpm_85xx.h
diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h
index bfef4dfd62..bfef4dfd62 100644
--- a/include/asm-ppc/e300.h
+++ b/arch/ppc/include/asm/e300.h
diff --git a/include/asm-ppc/errno.h b/arch/ppc/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-ppc/errno.h
+++ b/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
index 55923e09b3..55923e09b3 100644
--- a/include/asm-ppc/fsl_ddr_dimm_params.h
+++ b/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
index 3216a50633..3216a50633 100644
--- a/include/asm-ppc/fsl_ddr_sdram.h
+++ b/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
index 11641912a6..11641912a6 100644
--- a/include/asm-ppc/fsl_dma.h
+++ b/arch/ppc/include/asm/fsl_dma.h
diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h
index 4f71341327..4f71341327 100644
--- a/include/asm-ppc/fsl_i2c.h
+++ b/arch/ppc/include/asm/fsl_i2c.h
diff --git a/include/asm-ppc/fsl_law.h b/arch/ppc/include/asm/fsl_law.h
index 34c56a259a..34c56a259a 100644
--- a/include/asm-ppc/fsl_law.h
+++ b/arch/ppc/include/asm/fsl_law.h
diff --git a/include/asm-ppc/fsl_lbc.h b/arch/ppc/include/asm/fsl_lbc.h
index 5723de643a..5723de643a 100644
--- a/include/asm-ppc/fsl_lbc.h
+++ b/arch/ppc/include/asm/fsl_lbc.h
diff --git a/include/asm-ppc/fsl_pci.h b/arch/ppc/include/asm/fsl_pci.h
index db61e7e9cb..db61e7e9cb 100644
--- a/include/asm-ppc/fsl_pci.h
+++ b/arch/ppc/include/asm/fsl_pci.h
diff --git a/include/asm-ppc/fsl_serdes.h b/arch/ppc/include/asm/fsl_serdes.h
index 6da4b6ff94..6da4b6ff94 100644
--- a/include/asm-ppc/fsl_serdes.h
+++ b/arch/ppc/include/asm/fsl_serdes.h
diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h
index d3dd44e96d..d3dd44e96d 100644
--- a/include/asm-ppc/global_data.h
+++ b/arch/ppc/include/asm/global_data.h
diff --git a/include/asm-ppc/gpio.h b/arch/ppc/include/asm/gpio.h
index 23e29b195e..23e29b195e 100644
--- a/include/asm-ppc/gpio.h
+++ b/arch/ppc/include/asm/gpio.h
diff --git a/include/asm-ppc/immap_512x.h b/arch/ppc/include/asm/immap_512x.h
index 95350fd9b8..95350fd9b8 100644
--- a/include/asm-ppc/immap_512x.h
+++ b/arch/ppc/include/asm/immap_512x.h
diff --git a/include/asm-ppc/immap_8220.h b/arch/ppc/include/asm/immap_8220.h
index f9595f42d9..f9595f42d9 100644
--- a/include/asm-ppc/immap_8220.h
+++ b/arch/ppc/include/asm/immap_8220.h
diff --git a/include/asm-ppc/immap_8260.h b/arch/ppc/include/asm/immap_8260.h
index 4974ae56fc..4974ae56fc 100644
--- a/include/asm-ppc/immap_8260.h
+++ b/arch/ppc/include/asm/immap_8260.h
diff --git a/include/asm-ppc/immap_83xx.h b/arch/ppc/include/asm/immap_83xx.h
index 6b42a73f3f..6b42a73f3f 100644
--- a/include/asm-ppc/immap_83xx.h
+++ b/arch/ppc/include/asm/immap_83xx.h
diff --git a/include/asm-ppc/immap_85xx.h b/arch/ppc/include/asm/immap_85xx.h
index 957ad76a79..957ad76a79 100644
--- a/include/asm-ppc/immap_85xx.h
+++ b/arch/ppc/include/asm/immap_85xx.h
diff --git a/include/asm-ppc/immap_86xx.h b/arch/ppc/include/asm/immap_86xx.h
index fd7acdb767..fd7acdb767 100644
--- a/include/asm-ppc/immap_86xx.h
+++ b/arch/ppc/include/asm/immap_86xx.h
diff --git a/include/asm-ppc/immap_qe.h b/arch/ppc/include/asm/immap_qe.h
index 531cfc891d..531cfc891d 100644
--- a/include/asm-ppc/immap_qe.h
+++ b/arch/ppc/include/asm/immap_qe.h
diff --git a/include/asm-ppc/interrupt.h b/arch/ppc/include/asm/interrupt.h
index 792836b229..792836b229 100644
--- a/include/asm-ppc/interrupt.h
+++ b/arch/ppc/include/asm/interrupt.h
diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h
index 4ddad26e81..4ddad26e81 100644
--- a/include/asm-ppc/io.h
+++ b/arch/ppc/include/asm/io.h
diff --git a/include/asm-ppc/iopin_8260.h b/arch/ppc/include/asm/iopin_8260.h
index 619f3a8abe..619f3a8abe 100644
--- a/include/asm-ppc/iopin_8260.h
+++ b/arch/ppc/include/asm/iopin_8260.h
diff --git a/include/asm-ppc/iopin_85xx.h b/arch/ppc/include/asm/iopin_85xx.h
index 0f07ba355e..0f07ba355e 100644
--- a/include/asm-ppc/iopin_85xx.h
+++ b/arch/ppc/include/asm/iopin_85xx.h
diff --git a/include/asm-ppc/iopin_8xx.h b/arch/ppc/include/asm/iopin_8xx.h
index 3a2a682f66..3a2a682f66 100644
--- a/include/asm-ppc/iopin_8xx.h
+++ b/arch/ppc/include/asm/iopin_8xx.h
diff --git a/include/asm-ppc/m8260_pci.h b/arch/ppc/include/asm/m8260_pci.h
index 45f01de820..45f01de820 100644
--- a/include/asm-ppc/m8260_pci.h
+++ b/arch/ppc/include/asm/m8260_pci.h
diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h
index 5f806c4ec2..5f806c4ec2 100644
--- a/include/asm-ppc/mc146818rtc.h
+++ b/arch/ppc/include/asm/mc146818rtc.h
diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h
index ce7f081005..ce7f081005 100644
--- a/include/asm-ppc/mmu.h
+++ b/arch/ppc/include/asm/mmu.h
diff --git a/include/asm-ppc/mp.h b/arch/ppc/include/asm/mp.h
index 5388c951c8..5388c951c8 100644
--- a/include/asm-ppc/mp.h
+++ b/arch/ppc/include/asm/mp.h
diff --git a/include/asm-ppc/mpc512x.h b/arch/ppc/include/asm/mpc512x.h
index 960e229294..960e229294 100644
--- a/include/asm-ppc/mpc512x.h
+++ b/arch/ppc/include/asm/mpc512x.h
diff --git a/include/asm-ppc/mpc8349_pci.h b/arch/ppc/include/asm/mpc8349_pci.h
index 7a1adba950..7a1adba950 100644
--- a/include/asm-ppc/mpc8349_pci.h
+++ b/arch/ppc/include/asm/mpc8349_pci.h
diff --git a/include/asm-ppc/mpc8xxx_spi.h b/arch/ppc/include/asm/mpc8xxx_spi.h
index 41737d3c69..41737d3c69 100644
--- a/include/asm-ppc/mpc8xxx_spi.h
+++ b/arch/ppc/include/asm/mpc8xxx_spi.h
diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h
index 9b738c383f..9b738c383f 100644
--- a/include/asm-ppc/pci_io.h
+++ b/arch/ppc/include/asm/pci_io.h
diff --git a/include/asm-ppc/pnp.h b/arch/ppc/include/asm/pnp.h
index 22ceba2253..22ceba2253 100644
--- a/include/asm-ppc/pnp.h
+++ b/arch/ppc/include/asm/pnp.h
diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h
index 9170728117..9170728117 100644
--- a/include/asm-ppc/posix_types.h
+++ b/arch/ppc/include/asm/posix_types.h
diff --git a/include/asm-ppc/ppc4xx-ebc.h b/arch/ppc/include/asm/ppc4xx-ebc.h
index 9c17e46252..9c17e46252 100644
--- a/include/asm-ppc/ppc4xx-ebc.h
+++ b/arch/ppc/include/asm/ppc4xx-ebc.h
diff --git a/include/asm-ppc/ppc4xx-isram.h b/arch/ppc/include/asm/ppc4xx-isram.h
index d6d17ac961..d6d17ac961 100644
--- a/include/asm-ppc/ppc4xx-isram.h
+++ b/arch/ppc/include/asm/ppc4xx-isram.h
diff --git a/include/asm-ppc/ppc4xx-sdram.h b/arch/ppc/include/asm/ppc4xx-sdram.h
index 92be514b40..92be514b40 100644
--- a/include/asm-ppc/ppc4xx-sdram.h
+++ b/arch/ppc/include/asm/ppc4xx-sdram.h
diff --git a/include/asm-ppc/ppc4xx-uic.h b/arch/ppc/include/asm/ppc4xx-uic.h
index 782d0454b7..782d0454b7 100644
--- a/include/asm-ppc/ppc4xx-uic.h
+++ b/arch/ppc/include/asm/ppc4xx-uic.h
diff --git a/include/asm-ppc/ppc4xx_config.h b/arch/ppc/include/asm/ppc4xx_config.h
index 49acb60aed..49acb60aed 100644
--- a/include/asm-ppc/ppc4xx_config.h
+++ b/arch/ppc/include/asm/ppc4xx_config.h
diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h
index 9ec319ae17..9ec319ae17 100644
--- a/include/asm-ppc/processor.h
+++ b/arch/ppc/include/asm/processor.h
diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h
index 196613b9f1..196613b9f1 100644
--- a/include/asm-ppc/ptrace.h
+++ b/arch/ppc/include/asm/ptrace.h
diff --git a/include/asm-ppc/residual.h b/arch/ppc/include/asm/residual.h
index dc85edbc3c..dc85edbc3c 100644
--- a/include/asm-ppc/residual.h
+++ b/arch/ppc/include/asm/residual.h
diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h
index 715c868ab6..715c868ab6 100644
--- a/include/asm-ppc/sigcontext.h
+++ b/arch/ppc/include/asm/sigcontext.h
diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h
index b11a28efd1..b11a28efd1 100644
--- a/include/asm-ppc/signal.h
+++ b/arch/ppc/include/asm/signal.h
diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h
index 037570993a..037570993a 100644
--- a/include/asm-ppc/status_led.h
+++ b/arch/ppc/include/asm/status_led.h
diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h
index d912a6b5fe..d912a6b5fe 100644
--- a/include/asm-ppc/string.h
+++ b/arch/ppc/include/asm/string.h
diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h
index b27a6b753a..b27a6b753a 100644
--- a/include/asm-ppc/types.h
+++ b/arch/ppc/include/asm/types.h
diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h
index ea2d22df27..ea2d22df27 100644
--- a/include/asm-ppc/u-boot.h
+++ b/arch/ppc/include/asm/u-boot.h
diff --git a/include/asm-ppc/unaligned.h b/arch/ppc/include/asm/unaligned.h
index 5f1b1e3c21..5f1b1e3c21 100644
--- a/include/asm-ppc/unaligned.h
+++ b/arch/ppc/include/asm/unaligned.h
diff --git a/include/asm-ppc/xilinx_irq.h b/arch/ppc/include/asm/xilinx_irq.h
index 61171c21ff..61171c21ff 100644
--- a/include/asm-ppc/xilinx_irq.h
+++ b/arch/ppc/include/asm/xilinx_irq.h
diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h
index c57d628478..c57d628478 100644
--- a/include/asm-sh/bitops.h
+++ b/arch/sh/include/asm/bitops.h
diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h
index 25626a0760..25626a0760 100644
--- a/include/asm-sh/byteorder.h
+++ b/arch/sh/include/asm/byteorder.h
diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h
index 2cfc0a7944..2cfc0a7944 100644
--- a/include/asm-sh/cache.h
+++ b/arch/sh/include/asm/cache.h
diff --git a/include/asm-sh/clk.h b/arch/sh/include/asm/clk.h
index 9cac6b09f9..9cac6b09f9 100644
--- a/include/asm-sh/clk.h
+++ b/arch/sh/include/asm/clk.h
diff --git a/include/asm-sh/config.h b/arch/sh/include/asm/config.h
index 978cc92f40..978cc92f40 100644
--- a/include/asm-sh/config.h
+++ b/arch/sh/include/asm/config.h
diff --git a/include/asm-sh/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h
index 8bc9bc64c5..8bc9bc64c5 100644
--- a/include/asm-sh/cpu_sh2.h
+++ b/arch/sh/include/asm/cpu_sh2.h
diff --git a/include/asm-sh/cpu_sh3.h b/arch/sh/include/asm/cpu_sh3.h
index 6db38a2f84..6db38a2f84 100644
--- a/include/asm-sh/cpu_sh3.h
+++ b/arch/sh/include/asm/cpu_sh3.h
diff --git a/include/asm-sh/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h
index fdcebd608e..fdcebd608e 100644
--- a/include/asm-sh/cpu_sh4.h
+++ b/arch/sh/include/asm/cpu_sh4.h
diff --git a/include/asm-sh/cpu_sh7203.h b/arch/sh/include/asm/cpu_sh7203.h
index 77dcac43d3..77dcac43d3 100644
--- a/include/asm-sh/cpu_sh7203.h
+++ b/arch/sh/include/asm/cpu_sh7203.h
diff --git a/include/asm-sh/cpu_sh7710.h b/arch/sh/include/asm/cpu_sh7710.h
index e223f1ca16..e223f1ca16 100644
--- a/include/asm-sh/cpu_sh7710.h
+++ b/arch/sh/include/asm/cpu_sh7710.h
diff --git a/include/asm-sh/cpu_sh7720.h b/arch/sh/include/asm/cpu_sh7720.h
index 1b393b88a6..1b393b88a6 100644
--- a/include/asm-sh/cpu_sh7720.h
+++ b/arch/sh/include/asm/cpu_sh7720.h
diff --git a/include/asm-sh/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h
index 0975b78e9b..0975b78e9b 100644
--- a/include/asm-sh/cpu_sh7722.h
+++ b/arch/sh/include/asm/cpu_sh7722.h
diff --git a/include/asm-sh/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h
index 6dac6e9a01..6dac6e9a01 100644
--- a/include/asm-sh/cpu_sh7723.h
+++ b/arch/sh/include/asm/cpu_sh7723.h
diff --git a/include/asm-sh/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h
index 4e43a465e6..4e43a465e6 100644
--- a/include/asm-sh/cpu_sh7750.h
+++ b/arch/sh/include/asm/cpu_sh7750.h
diff --git a/include/asm-sh/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h
index 78b456b4b2..78b456b4b2 100644
--- a/include/asm-sh/cpu_sh7763.h
+++ b/arch/sh/include/asm/cpu_sh7763.h
diff --git a/include/asm-sh/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h
index d4f824e715..d4f824e715 100644
--- a/include/asm-sh/cpu_sh7780.h
+++ b/arch/sh/include/asm/cpu_sh7780.h
diff --git a/include/asm-sh/cpu_sh7785.h b/arch/sh/include/asm/cpu_sh7785.h
index 4a4dfc9042..4a4dfc9042 100644
--- a/include/asm-sh/cpu_sh7785.h
+++ b/arch/sh/include/asm/cpu_sh7785.h
diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-sh/errno.h
+++ b/arch/sh/include/asm/errno.h
diff --git a/include/asm-sh/global_data.h b/arch/sh/include/asm/global_data.h
index c12b8558ec..c12b8558ec 100644
--- a/include/asm-sh/global_data.h
+++ b/arch/sh/include/asm/global_data.h
diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h
index ca598a60f3..ca598a60f3 100644
--- a/include/asm-sh/io.h
+++ b/arch/sh/include/asm/io.h
diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h
index 830e5486ac..830e5486ac 100644
--- a/include/asm-sh/irqflags.h
+++ b/arch/sh/include/asm/irqflags.h
diff --git a/include/asm-sh/macro.h b/arch/sh/include/asm/macro.h
index 2b273c3ef4..2b273c3ef4 100644
--- a/include/asm-sh/macro.h
+++ b/arch/sh/include/asm/macro.h
diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h
index 040c532132..040c532132 100644
--- a/include/asm-sh/pci.h
+++ b/arch/sh/include/asm/pci.h
diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h
index c9d9fb84f1..c9d9fb84f1 100644
--- a/include/asm-sh/posix_types.h
+++ b/arch/sh/include/asm/posix_types.h
diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h
index 938a89cff5..938a89cff5 100644
--- a/include/asm-sh/processor.h
+++ b/arch/sh/include/asm/processor.h
diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h
index 16252cc25b..16252cc25b 100644
--- a/include/asm-sh/ptrace.h
+++ b/arch/sh/include/asm/ptrace.h
diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h
index 27d981b79a..27d981b79a 100644
--- a/include/asm-sh/string.h
+++ b/arch/sh/include/asm/string.h
diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h
index a62c42261d..a62c42261d 100644
--- a/include/asm-sh/system.h
+++ b/arch/sh/include/asm/system.h
diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h
index aed4a6eb57..aed4a6eb57 100644
--- a/include/asm-sh/types.h
+++ b/arch/sh/include/asm/types.h
diff --git a/include/asm-sh/u-boot.h b/arch/sh/include/asm/u-boot.h
index 27d43b9347..27d43b9347 100644
--- a/include/asm-sh/u-boot.h
+++ b/arch/sh/include/asm/u-boot.h
diff --git a/include/asm-sh/unaligned-sh4a.h b/arch/sh/include/asm/unaligned-sh4a.h
index 9f4dd252c9..9f4dd252c9 100644
--- a/include/asm-sh/unaligned-sh4a.h
+++ b/arch/sh/include/asm/unaligned-sh4a.h
diff --git a/include/asm-sh/unaligned.h b/arch/sh/include/asm/unaligned.h
index 2e0d164050..2e0d164050 100644
--- a/include/asm-sh/unaligned.h
+++ b/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
index 38fdd5c8c7..38fdd5c8c7 100644
--- a/include/asm-sparc/arch-leon2/asi.h
+++ b/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
index 700b3caa5e..700b3caa5e 100644
--- a/include/asm-sparc/arch-leon3/asi.h
+++ b/arch/sparc/include/asm/arch-leon3/asi.h
diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h
index bf6d70fece..bf6d70fece 100644
--- a/include/asm-sparc/asi.h
+++ b/arch/sparc/include/asm/asi.h
diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
index aeb87ee7dd..aeb87ee7dd 100644
--- a/include/asm-sparc/asmmacro.h
+++ b/arch/sparc/include/asm/asmmacro.h
diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h
index 636498d557..636498d557 100644
--- a/include/asm-sparc/atomic.h
+++ b/arch/sparc/include/asm/atomic.h
diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h
index ceb39f2fe5..ceb39f2fe5 100644
--- a/include/asm-sparc/bitops.h
+++ b/arch/sparc/include/asm/bitops.h
diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h
index b9fc65663f..b9fc65663f 100644
--- a/include/asm-sparc/byteorder.h
+++ b/arch/sparc/include/asm/byteorder.h
diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h
index 03e8d94bb2..03e8d94bb2 100644
--- a/include/asm-sparc/cache.h
+++ b/arch/sparc/include/asm/cache.h
diff --git a/include/asm-sparc/config.h b/arch/sparc/include/asm/config.h
index 36438be112..36438be112 100644
--- a/include/asm-sparc/config.h
+++ b/arch/sparc/include/asm/config.h
diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/include/asm-sparc/errno.h
+++ b/arch/sparc/include/asm/errno.h
diff --git a/include/asm-sparc/global_data.h b/arch/sparc/include/asm/global_data.h
index dea2857274..dea2857274 100644
--- a/include/asm-sparc/global_data.h
+++ b/arch/sparc/include/asm/global_data.h
diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h
index 0c5d86cb3a..0c5d86cb3a 100644
--- a/include/asm-sparc/io.h
+++ b/arch/sparc/include/asm/io.h
diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h
index c5538c092d..c5538c092d 100644
--- a/include/asm-sparc/irq.h
+++ b/arch/sparc/include/asm/irq.h
diff --git a/include/asm-sparc/leon.h b/arch/sparc/include/asm/leon.h
index f7175eee9f..f7175eee9f 100644
--- a/include/asm-sparc/leon.h
+++ b/arch/sparc/include/asm/leon.h
diff --git a/include/asm-sparc/leon2.h b/arch/sparc/include/asm/leon2.h
index fa55cade0b..fa55cade0b 100644
--- a/include/asm-sparc/leon2.h
+++ b/arch/sparc/include/asm/leon2.h
diff --git a/include/asm-sparc/leon3.h b/arch/sparc/include/asm/leon3.h
index b90d35b198..b90d35b198 100644
--- a/include/asm-sparc/leon3.h
+++ b/arch/sparc/include/asm/leon3.h
diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h
index 1e26195991..1e26195991 100644
--- a/include/asm-sparc/machines.h
+++ b/arch/sparc/include/asm/machines.h
diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h
index 484953a86d..484953a86d 100644
--- a/include/asm-sparc/page.h
+++ b/arch/sparc/include/asm/page.h
diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h
index 8d98b2a6a1..8d98b2a6a1 100644
--- a/include/asm-sparc/posix_types.h
+++ b/arch/sparc/include/asm/posix_types.h
diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h
index d518389ad6..d518389ad6 100644
--- a/include/asm-sparc/processor.h
+++ b/arch/sparc/include/asm/processor.h
diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h
index d55cc863da..d55cc863da 100644
--- a/include/asm-sparc/prom.h
+++ b/arch/sparc/include/asm/prom.h
diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h
index fc779477e5..fc779477e5 100644
--- a/include/asm-sparc/psr.h
+++ b/arch/sparc/include/asm/psr.h
diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h
index 12a9c569a2..12a9c569a2 100644
--- a/include/asm-sparc/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
diff --git a/include/asm-sparc/srmmu.h b/arch/sparc/include/asm/srmmu.h
index 5214d96a7e..5214d96a7e 100644
--- a/include/asm-sparc/srmmu.h
+++ b/arch/sparc/include/asm/srmmu.h
diff --git a/include/asm-sparc/stack.h b/arch/sparc/include/asm/stack.h
index b40a9f355f..b40a9f355f 100644
--- a/include/asm-sparc/stack.h
+++ b/arch/sparc/include/asm/stack.h
diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h
index c6bbc203d5..c6bbc203d5 100644
--- a/include/asm-sparc/string.h
+++ b/arch/sparc/include/asm/string.h
diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h
index 0a8a26c597..0a8a26c597 100644
--- a/include/asm-sparc/types.h
+++ b/arch/sparc/include/asm/types.h
diff --git a/include/asm-sparc/u-boot.h b/arch/sparc/include/asm/u-boot.h
index 209873ffec..209873ffec 100644
--- a/include/asm-sparc/u-boot.h
+++ b/arch/sparc/include/asm/u-boot.h
diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h
index 66fc639a7e..66fc639a7e 100644
--- a/include/asm-sparc/winmacro.h
+++ b/arch/sparc/include/asm/winmacro.h
diff --git a/mkconfig b/mkconfig
index 0f7f13e3a4..d3109e412c 100755
--- 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
 
 #