Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"

The appropriate include/asm-$ARCH directory should already by symlinked
to include/asm so using the whole "asm-$ARCH" path is unnecessary.

This change should also allow us to move the include/asm-$ARCH
directories into their appropriate lib/$ARCH/ directories.

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

diff --git a/board/amcc/bamboo/init.S b/board/amcc/bamboo/init.S
index a5c9d6d76493155d5066dae1cad9e55c426eb7b8..7439c805c2cc1e10188d807df2d6b4e69e96b5da 100644 (file)
--- a/board/amcc/bamboo/init.S
+++ b/board/amcc/bamboo/init.S
@@ -25,7 +25,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S
index 0b667968accd56be09dea92997e6c34c4ee1f9a9..993bec30ea6fa12cd0f522eec5f966ec985d20cc 100644 (file)
--- a/board/amcc/canyonlands/init.S
+++ b/board/amcc/canyonlands/init.S
@@ -23,7 +23,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/ebony/init.S b/board/amcc/ebony/init.S
index 811a96a1f4690ea4dfe7dcd1e85ae27f51dfc629..153fa811c481951bf9f81ee940d50e14ec44c2e3 100644 (file)
--- a/board/amcc/ebony/init.S
+++ b/board/amcc/ebony/init.S
@@ -22,7 +22,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/katmai/init.S b/board/amcc/katmai/init.S
index 1c74a82c3d63d8ac4b43268dd5bf373a4aee6316..90598f63bc541c75fe2e698f73cfa5b27a5b0997 100644 (file)
--- a/board/amcc/katmai/init.S
+++ b/board/amcc/katmai/init.S
@@ -25,7 +25,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/luan/init.S b/board/amcc/luan/init.S
index fb54dea3a08150887d7d0486d92183be611944e7..513b0fc560235f308eba173b059fb5c7d2417c5d 100644 (file)
--- a/board/amcc/luan/init.S
+++ b/board/amcc/luan/init.S
@@ -25,7 +25,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/ocotea/init.S b/board/amcc/ocotea/init.S
index 8bcfbb197ec3527c5262e84ea1321da68a6dd610..e7c75dfac542a1319ba21d53c76245bcadae5d27 100644 (file)
--- a/board/amcc/ocotea/init.S
+++ b/board/amcc/ocotea/init.S
@@ -22,7 +22,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/redwood/init.S b/board/amcc/redwood/init.S
index 363d7932aca1357af25d8ad6f67f5942c45fd60b..4da586918d1005a811f1f8a31adc9e59033f3364 100644 (file)
--- a/board/amcc/redwood/init.S
+++ b/board/amcc/redwood/init.S
@@ -23,7 +23,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/amcc/redwood/redwood.c b/board/amcc/redwood/redwood.c
index bc8cb0c443afa9ca7ef2aa292903f969051553cb..32fb8c584b943e4b94c057cfff870645e32a3cba 100644 (file)
--- a/board/amcc/redwood/redwood.c
+++ b/board/amcc/redwood/redwood.c
@@ -29,7 +29,7 @@
 #include <ppc4xx.h>
 #include <asm/processor.h>
 #include <i2c.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 
 int compare_to_true(char *str);
 char *remove_l_w_space(char *in_str);

diff --git a/board/amcc/sequoia/init.S b/board/amcc/sequoia/init.S
index 3c0e400f9532526970b444f1f77c1137e748ac98..f090070b4dd5784d9abae5a81ffa437a279245e8 100644 (file)
--- a/board/amcc/sequoia/init.S
+++ b/board/amcc/sequoia/init.S
@@ -22,7 +22,7 @@
  */
 
 #include <ppc_asm.tmpl>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 #include <config.h>
 
 /*

diff --git a/board/amcc/yucca/init.S b/board/amcc/yucca/init.S
index 9308fdac2015d89d5a9da02500610c73f53496e1..f51035ff68236ed442d62cbe3e58e04bd9e8ff7c 100644 (file)
--- a/board/amcc/yucca/init.S
+++ b/board/amcc/yucca/init.S
@@ -25,7 +25,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/bf537-stamp/cmd_bf537led.c b/board/bf537-stamp/cmd_bf537led.c
index e65c4f83595f8638fd02d59959e646f44f9df3b2..317f088497d5654cd8db246afa0df07adb58e7fa 100644 (file)
--- a/board/bf537-stamp/cmd_bf537led.c
+++ b/board/bf537-stamp/cmd_bf537led.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <command.h>
 #include <asm/blackfin.h>
-#include <asm-blackfin/string.h>
+#include <asm/string.h>
 #ifdef CONFIG_BF537_STAMP_LEDCMD
 
 /* Define the command usage in a reusable way */

diff --git a/board/esd/du440/init.S b/board/esd/du440/init.S
index 3cac6b11bb0af849104e4cdbd9981e8c4b370cd8..afcf9c4a535bb08fd77a4b544a5702a84f24533e 100644 (file)
--- a/board/esd/du440/init.S
+++ b/board/esd/du440/init.S
@@ -22,7 +22,7 @@
  */
 
 #include <ppc_asm.tmpl>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 #include <config.h>
 
 /*

diff --git a/board/esd/pmc440/init.S b/board/esd/pmc440/init.S
index 6585fed664746243d67e43501fa850f9511d1b49..d51cd0cf05877c7630db3dcde5793b0e391e85f4 100644 (file)
--- a/board/esd/pmc440/init.S
+++ b/board/esd/pmc440/init.S
@@ -20,7 +20,7 @@
  */
 
 #include <ppc_asm.tmpl>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 #include <config.h>
 
 /*

diff --git a/board/galaxy5200/galaxy5200.c b/board/galaxy5200/galaxy5200.c
index 5aa9d3a6f1037532153da850fe099b78f4f26bf8..d4a2245b2b6c3f4838175f4ad63c81b7ff71f603 100644 (file)
--- a/board/galaxy5200/galaxy5200.c
+++ b/board/galaxy5200/galaxy5200.c
@@ -33,7 +33,7 @@
 #include <common.h>
 #include <mpc5xxx.h>
 #include <pci.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 
 #ifndef CONFIG_SYS_RAMBOOT
 static void sdram_start(int hi_addr)

diff --git a/board/gdsys/intip/init.S b/board/gdsys/intip/init.S
index e205c9d7e8e21f1ccaf624a80de1e826f7ed99cd..a8e8b6c1c25a19edde0f7f3821f51e7e6a422510 100644 (file)
--- a/board/gdsys/intip/init.S
+++ b/board/gdsys/intip/init.S
@@ -27,7 +27,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/korat/init.S b/board/korat/init.S
index ea43a1f89865611c7dc2e53c702ec905cfddfec7..c725bbbb44d4b9e4a4673172812284d96fd64eed 100644 (file)
--- a/board/korat/init.S
+++ b/board/korat/init.S
@@ -20,7 +20,7 @@
  */
 
 #include <ppc_asm.tmpl>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 #include <config.h>
 
 /**************************************************************************

diff --git a/board/lwmon5/init.S b/board/lwmon5/init.S
index 718cec6af56772c1c11d72668f715fa2ee969d77..c714fb7ad9734d9a7cc32f2c8353277bc71a7771 100644 (file)
--- a/board/lwmon5/init.S
+++ b/board/lwmon5/init.S
@@ -25,7 +25,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 /**************************************************************************
  * TLB TABLE

diff --git a/board/m501sk/m501sk.h b/board/m501sk/m501sk.h
index 42a67573da2ce592254692e06f9f5f150e7c8e39..51d10f58a9c4b3c92c66b139d726c7595b39a8d1 100644 (file)
--- a/board/m501sk/m501sk.h
+++ b/board/m501sk/m501sk.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-at91/hardware.h
+ * linux/include/asm/arch-at91/hardware.h
  *
  *  Copyright (C) 2003 SAN People
  *
@@ -21,9 +21,9 @@
 #define __M501SK_H
 
 #ifndef __ASSEMBLY__
-#include <asm-arm/arch-at91rm9200/AT91RM9200.h>
+#include <asm/arch-at91rm9200/AT91RM9200.h>
 #else
-#include <asm-arm/arch-at91rm9200/AT91RM9200_inc.h>
+#include <asm/arch-at91rm9200/AT91RM9200_inc.h>
 #endif
 
 #define AT91C_PIO_PA22 ((unsigned int) 1 << 22) /* Pin Controlled by PA22 */

diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index 3f07ff1263eb6b5dfd86d45dc875ad0fbbe0f652..1c99405bea9cb4288f199c7e3342dae8cc3cbd4c 100644 (file)
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -22,7 +22,7 @@
 #include  <ppc4xx.h>
 #include  <asm/processor.h>
 #include  <asm/io.h>
-#include  <asm-ppc/u-boot.h>
+#include  <asm/u-boot.h>
 #include  "../common/nm.h"
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index cc2f99874eaf134f8bea3840f928b89170271e8c..87bc45edb42f821c1a86d3ce39be8ed97ac5b8d5 100644 (file)
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -22,7 +22,7 @@
 #include  <ppc4xx.h>
 #include  <asm/processor.h>
 #include  <asm/io.h>
-#include  <asm-ppc/u-boot.h>
+#include  <asm/u-boot.h>
 #include  "../common/nm.h"
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c
index 416d3070b59d950737fee4454846c9070a20b2e3..77ce3899efbe99f76c0026dd0e80a9a4f49ca19e 100644 (file)
--- a/board/phytec/pcm030/pcm030.c
+++ b/board/phytec/pcm030/pcm030.c
@@ -30,7 +30,7 @@
 #include <common.h>
 #include <mpc5xxx.h>
 #include <pci.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 
 #include "mt46v32m16-75.h"
 

diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c
index dc6fac46d344defa18eaaecef29fd7c7c297bc1b..97c37eaa3939d88cbc712473ba2f98518fde886b 100644 (file)
--- a/board/pleb2/pleb2.c
+++ b/board/pleb2/pleb2.c
@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <asm-arm/mach-types.h>
+#include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c
index 7571cd950c0463fbbaff807390c8b1475870ca19..f3bc1fa7a1693c291a46f86ba796f53bd57edc10 100644 (file)
--- a/board/prodrive/alpr/fpga.c
+++ b/board/prodrive/alpr/fpga.c
@@ -30,7 +30,7 @@
 #include <altera.h>
 #include <ACEX1K.h>
 #include <command.h>
-#include <asm-ppc/processor.h>
+#include <asm/processor.h>
 #include <ppc440.h>
 #include "fpga.h"
 

diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index 35c4e60b5acd3c4f6ef951cdfa1594e45539c07f..dbc0cee7588130edac9418c4d0aa6991b59837c2 100644 (file)
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -31,7 +31,7 @@
 #include <i2c.h>
 #include <command.h>
 #include "ppc440gx_i2c.h"
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 
 #ifdef CONFIG_I2C_BUS1
 

diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 4fd8cd696922e195aa727673b18b5eb01895c6f0..e5648799a65266e6ef9822fa38584ec553a5b4b7 100644 (file)
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -28,7 +28,7 @@
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <miiphy.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 #include <pci.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/xilinx/ppc440-generic/init.S b/board/xilinx/ppc440-generic/init.S
index 1409467ea0476f69efce5fe535c2179f28cd0ee5..54f2d7fbc19f3cf89a3f9538be3ab04c57e5ca5d 100644 (file)
--- a/board/xilinx/ppc440-generic/init.S
+++ b/board/xilinx/ppc440-generic/init.S
@@ -19,7 +19,7 @@
 
 #include <ppc_asm.tmpl>
 #include <config.h>
-#include <asm-ppc/mmu.h>
+#include <asm/mmu.h>
 
 .section .bootpg,"ax"
 .globl tlbtab

diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c
index f3b921477bf5fca321217d21754d2d89acf21cb7..10b58b7118010ff72ea74fe0052e201629779268 100644 (file)
--- a/cpu/ppc4xx/4xx_pcie.c
+++ b/cpu/ppc4xx/4xx_pcie.c
@@ -29,7 +29,7 @@
 #include <pci.h>
 #include <ppc4xx.h>
 #include <asm/processor.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 #include <asm/errno.h>
 
 #if (defined(CONFIG_440SPE) || defined(CONFIG_405EX) ||        \

diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c
index 9b86187a798082957fed8a928f86ec1b3bfb6d22..e9548f1a68110b308446fee9a16c6c62006d0ec0 100644 (file)
--- a/drivers/i2c/ppc4xx_i2c.c
+++ b/drivers/i2c/ppc4xx_i2c.c
@@ -30,7 +30,7 @@
 #include <ppc4xx.h>
 #include <4xx_i2c.h>
 #include <i2c.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 
 #ifdef CONFIG_HARD_I2C
 

diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h
index ec053c9912d7f614cbc7ff50e87014b536d37f48..9bee19ffbbaf0441b8e039c05055ebf5d733eeed 100644 (file)
--- a/include/asm-arm/arch-arm720t/hardware.h
+++ b/include/asm-arm/arch-arm720t/hardware.h
@@ -25,7 +25,7 @@
  */
 
 #if defined(CONFIG_NETARM)
-#include <asm-arm/arch-arm720t/netarm_registers.h>
+#include <asm/arch-arm720t/netarm_registers.h>
 #elif defined(CONFIG_IMPA7)
 /* include IMPA7 specific hardware file if there was one */
 #elif defined(CONFIG_EP7312)

diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/include/asm-arm/arch-lpc2292/hardware.h
index fd2b464e37b9fddf228be6c4956e5eaa76dc506f..5e227e367cde763d5873481814d3c7728b4d0952 100644 (file)
--- a/include/asm-arm/arch-lpc2292/hardware.h
+++ b/include/asm-arm/arch-lpc2292/hardware.h
@@ -25,7 +25,7 @@
  */
 
 #if defined(CONFIG_LPC2292)
-#include <asm-arm/arch-lpc2292/lpc2292_registers.h>
+#include <asm/arch-lpc2292/lpc2292_registers.h>
 #else
 #error No hardware file defined for this configuration
 #endif

diff --git a/nand_spl/board/freescale/mpc8569mds/nand_boot.c b/nand_spl/board/freescale/mpc8569mds/nand_boot.c
index e03065699cc9ed1b631eca6eabd11ed9feb02644..047da3470fa842b5d1f56a035ea4a85c6d92e857 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/nand_boot.c
+++ b/nand_spl/board/freescale/mpc8569mds/nand_boot.c
@@ -20,7 +20,7 @@
  */
 #include <common.h>
 #include <mpc85xx.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
 #include <asm/mmu.h>

diff --git a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
index af442ea270eeea2f670a3d6fe98b739e74255afd..16a756c3866158d134139af52ae5259e41b8b99f 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
+++ b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
@@ -20,7 +20,7 @@
  */
 #include <common.h>
 #include <mpc85xx.h>
-#include <asm-ppc/io.h>
+#include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
 #include <asm/mmu.h>

diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index f4040a7cf9e8d4f42aafc3a997971e28ee9274b8..bfae30e4607fe36b09a3bd422e8ee429df073c51 100644 (file)
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -27,9 +27,9 @@
 #include <common.h>
 #include <nand.h>
 #ifdef CONFIG_MX31
-#include <asm-arm/arch/mx31-regs.h>
+#include <asm/arch/mx31-regs.h>
 #else
-#include <asm-arm/arch/imx-regs.h>
+#include <asm/arch/imx-regs.h>
 #endif
 #include <asm/io.h>
 #include <fsl_nfc.h>