[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

16 files changed, 30 insertions, 30 deletions

diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c
index 9481990b8b..e8f85fc621 100644
--- a/drivers/nand/atmel_nand.c
+++ b/drivers/nand/atmel_nand.c
@@ -32,7 +32,7 @@
 #include <linux/mtd/nand.h>
 
 #include <asm/io.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index bda8ecf4bf..1198deb671 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -24,8 +24,8 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c
index 6b47022130..b74ade7810 100644
--- a/drivers/nand/nand_imx_v2.c
+++ b/drivers/nand/nand_imx_v2.c
@@ -17,8 +17,8 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_omap_gpmc.c b/drivers/nand/nand_omap_gpmc.c
index cc365bc3cf..c6647e56ed 100644
--- a/drivers/nand/nand_omap_gpmc.c
+++ b/drivers/nand/nand_omap_gpmc.c
@@ -72,9 +72,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/gpmc_nand.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/gpmc_nand.h>
 
 /* Enable me to get tons of debug messages -for use without jtag */
 #if 0
diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c
index 6423f85b63..b1fe377bef 100644
--- a/drivers/nand/nand_s3c2410.c
+++ b/drivers/nand/nand_s3c2410.c
@@ -30,9 +30,9 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 #include <asm/io.h>
 #include <asm-generic/errno.h>
 
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 6591b7b06b..9d8b8c75c5 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -29,9 +29,9 @@
 
 #include <asm/mmu.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <clock.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <xfuncs.h>
 
 #include "fec_imx.h"
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fabb4fa8f3..693e64f278 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -47,8 +47,8 @@
 #include <miiphy.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/board.h>
-#include <asm/arch/clk.h>
+#include <mach/board.h>
+#include <mach/clk.h>
 
 #include "macb.h"
 
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 6c52fb790c..e29f69ccb5 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -3,9 +3,9 @@
 #include <net.h>
 #include <asm/io.h>
 #include <miiphy.h>
-#include <asm/arch/netx-xc.h>
-#include <asm/arch/netx-eth.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-xc.h>
+#include <mach/netx-eth.h>
+#include <mach/netx-regs.h>
 #include <xfuncs.h>
 #include <miiphy.h>
 #include <init.h>
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index 3901835c16..e9e8116619 100644
--- a/drivers/serial/atmel.c
+++ b/drivers/serial/atmel.c
@@ -22,7 +22,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/clk.h>
+#include <mach/clk.h>
 
 /* USART3 register offsets */
 #define USART3_CR				0x0000
diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c
index 7f00b30ad6..f5546aa758 100644
--- a/drivers/serial/serial_at91rm9200.c
+++ b/drivers/serial/serial_at91rm9200.c
@@ -31,7 +31,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1)
 #error must define one of CONFIG_DBGU or CONFIG_USART0 or CONFIG_USART1
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 89f1c4a9af..91d3b188cc 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -18,8 +18,8 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c
index 68b4d20751..7c095197fd 100644
--- a/drivers/serial/serial_netx.c
+++ b/drivers/serial/serial_netx.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 92e9fa9b0c..fedddd33b3 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -25,8 +25,8 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
 
 /* Note: Offsets are for little endian access */
 #define ULCON 0x00		/* line control */
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 8a483082ef..5c9791978a 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -25,7 +25,7 @@
 #include <xfuncs.h>
 #include <asm/io.h>
 #include <gpio.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 #define MXC_CSPIRXDATA		0x00
 #define MXC_CSPITXDATA		0x04
diff --git a/drivers/spi/mc13783.c b/drivers/spi/mc13783.c
index 1cded4b783..19e2780920 100644
--- a/drivers/spi/mc13783.c
+++ b/drivers/spi/mc13783.c
@@ -24,7 +24,7 @@
 #include <spi/spi.h>
 #include <xfuncs.h>
 #include <errno.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 
 #define REG_INTERRUPT_STATUS_0			0x0
 #define	REG_INTERRUPT_MASK			0x1
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index 10aaa80cf3..9a30ca46f3 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -17,14 +17,14 @@
 #include <common.h>
 #include <fb.h>
 #include <asm/io.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imxfb.h>
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
 #include <init.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm-generic/div64.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #define LCDC_SSA	0x00