28 files changed, 87 insertions, 87 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 8911f8e675c4..d4d6385cad7c 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -22,17 +22,17 @@
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 170c9681d093..989ad152d7f8 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -29,19 +29,19 @@
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
-#include <asm/arch/led.h>
+#include <mach/led.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
-#include <asm/arch/control.h>
+#include <mach/control.h>
 /* LED & Switch macros */
 #define LED0_GPIO13             13
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 68ec3a32387a..9ba097868e72 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -20,16 +20,16 @@
 #include <linux/init.h>
 #include <linux/device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
 static void __init omap_generic_init_irq(void)
 {
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index a32b475dc09c..9e2624ca70a2 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -22,24 +22,24 @@
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/control.h>
+#include <mach/control.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
-#include <asm/arch/gpioexpander.h>
+#include <mach/gpioexpander.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
-#include <asm/arch/irda.h>
+#include <mach/irda.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/keypad.h>
+#include <mach/keypad.h>
-#include <asm/arch/menelaus.h>
+#include <mach/menelaus.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 15675bce8012..1d891e4a6933 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -25,9 +25,9 @@
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/sram.h>
-#include <asm/arch/cpu.h>
+#include <mach/cpu.h>
 #include <asm/div64.h>
 #include "memory.h"
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 3cd37cb57c5a..626e5fa93b6a 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -16,7 +16,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H
 #define __ARCH_ARM_MACH_OMAP2_CLOCK_H
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 /* The maximum error between a target DPLL rate and the rounded rate in Hz */
 #define DEFAULT_DPLL_RATE_TOLERANCE     50000
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index aa567876651d..295e671e9cfd 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -28,8 +28,8 @@
 #include <linux/io.h>
 #include <linux/cpufreq.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/sram.h>
 #include <asm/div64.h>
 #include <asm/bitops.h>
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 4263099b1ad3..3ff74952f835 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -26,8 +26,8 @@
 #include <linux/io.h>
 #include <linux/limits.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/sram.h>
 #include <asm/div64.h>
 #include <asm/bitops.h>
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 05757eb032bc..ec664457a11a 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
 #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
-#include <asm/arch/control.h>
+#include <mach/control.h>
 #include "clock.h"
 #include "cm.h"
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 51f70300996f..5f3aad977842 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -15,8 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/control.h>
+#include <mach/control.h>
 static void __iomem *omap2_ctrl_base;
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index a6acdcdbb63c..7a7f02559075 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -14,15 +14,15 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
-#include <asm/arch/tc.h>
+#include <mach/tc.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
@@ -142,7 +142,7 @@ static inline void omap_init_sti(void) {}
 #if defined(CONFIG_SPI_OMAP24XX)
-#include <asm/arch/mcspi.h>
+#include <mach/mcspi.h>
 #define OMAP2_MCSPI1_BASE               0x48098000
 #define OMAP2_MCSPI2_BASE               0x4809a000
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index dbf68dc50ae2..f51d69bc457d 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -18,7 +18,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
 #undef DEBUG
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index dff4b16cead6..a5d4526ac4d6 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -17,8 +17,8 @@
 #include <asm/io.h>
-#include <asm/arch/control.h>
+#include <mach/control.h>
-#include <asm/arch/cpu.h>
+#include <mach/cpu.h>
 #if defined(CONFIG_ARCH_OMAP2420)
 #define TAP_BASE        io_p2v(0x48014000)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 69c8174f3aac..987351f07d7b 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -21,8 +21,8 @@
 #include <asm/mach/map.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 extern void omap_sram_init(void);
 extern int omap2_clk_init(void);
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 6d4c4bf82ad5..9ef15b31d8fc 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 4799561c5a9e..a480b96948e4 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -14,8 +14,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <asm/arch/mailbox.h>
+#include <mach/mailbox.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 #define MAILBOX_REVISION                0x00
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 17cf199d1130..27eb6e3ca926 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -17,10 +17,10 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
-#include <asm/arch/cpu.h>
+#include <mach/cpu.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/mcbsp.h>
 struct mcbsp_internal_clk {
        struct clk clk;
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c
index 73cadb2c75cf..6b49cc9cbdcb 100644
--- a/arch/arm/mach-omap2/memory.c
+++ b/arch/arm/mach-omap2/memory.c
@@ -24,9 +24,9 @@
 #include <asm/io.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/sram.h>
 #include "prm.h"
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 8f98b20f30a1..443d07fef7f3 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -29,8 +29,8 @@
 #include <asm/io.h>
 #include <linux/spinlock.h>
-#include <asm/arch/control.h>
+#include <mach/control.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 #ifdef CONFIG_OMAP_MUX
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 5e6e595d8eff..8671e1079ab5 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -31,10 +31,10 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/sram.h>
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 static struct clk *vclk;
 static void (*omap2_sram_idle)(void);
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index fd92a80f38f2..f945156d5585 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -18,8 +18,8 @@
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/prcm.h>
+#include <mach/prcm.h>
 #include "clock.h"
 #include "prm.h"
diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index 1b1fe4f6e030..1a8bbd094066 100644
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -15,7 +15,7 @@
 */
 #undef DEBUG
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 #ifndef __ASSEMBLER__
 extern void __iomem *omap2_sdrc_base;
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index e9c367fc9f61..adc8a26a8fb0 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -20,8 +20,8 @@
 #include <asm/io.h>
-#include <asm/arch/common.h>
+#include <mach/common.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 static struct clk * uart1_ick = NULL;
 static struct clk * uart1_fck = NULL;
diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S
index 46ccb9b8b583..87a706fd5f82 100644
--- a/arch/arm/mach-omap2/sleep.S
+++ b/arch/arm/mach-omap2/sleep.S
@@ -23,8 +23,8 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
+#include <mach/io.h>
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 #include "sdrc.h"
diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S
index 229a9284ed90..af4bd3490227 100644
--- a/arch/arm/mach-omap2/sram242x.S
+++ b/arch/arm/mach-omap2/sram242x.S
@@ -24,8 +24,8 @@
 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
+#include <mach/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "prm.h"
 #include "cm.h"
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S
index 1665ebb9d7ce..84363e269e8c 100644
--- a/arch/arm/mach-omap2/sram243x.S
+++ b/arch/arm/mach-omap2/sram243x.S
@@ -24,8 +24,8 @@
 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
+#include <mach/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include "prm.h"
 #include "cm.h"
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 557603f99313..589393bedade 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -34,7 +34,7 @@
 #include <linux/clockchips.h>
 #include <asm/mach/time.h>
-#include <asm/arch/dmtimer.h>
+#include <mach/dmtimer.h>
 static struct omap_dm_timer *gptimer;
 static struct clock_event_device clockevent_gpt;
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 80bb42eb5082..1607c941d95f 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -15,9 +15,9 @@
 #include <linux/usb/musb.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 static u8               async_cs, sync_cs;

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 8911f8e675c4..d4d6385cad7c 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -22,17 +22,17 @@
22	#include <linux/err.h>	22	#include <linux/err.h>
23	#include <linux/clk.h>	23	#include <linux/clk.h>
24		24
25	#include <asm/arch/hardware.h>	25	#include <mach/hardware.h>
26	#include <asm/mach-types.h>	26	#include <asm/mach-types.h>
27	#include <asm/mach/arch.h>	27	#include <asm/mach/arch.h>
28	#include <asm/mach/map.h>	28	#include <asm/mach/map.h>
29	#include <asm/mach/flash.h>	29	#include <asm/mach/flash.h>
30		30
31	#include <asm/arch/gpio.h>	31	#include <mach/gpio.h>
32	#include <asm/arch/mux.h>	32	#include <mach/mux.h>
33	#include <asm/arch/board.h>	33	#include <mach/board.h>
34	#include <asm/arch/common.h>	34	#include <mach/common.h>
35	#include <asm/arch/gpmc.h>	35	#include <mach/gpmc.h>
36		36
37	#include <asm/io.h>	37	#include <asm/io.h>
38		38


diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 170c9681d093..989ad152d7f8 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c
@@ -29,19 +29,19 @@
29	#include <linux/err.h>	29	#include <linux/err.h>
30	#include <linux/clk.h>	30	#include <linux/clk.h>
31		31
32	#include <asm/arch/hardware.h>	32	#include <mach/hardware.h>
33	#include <asm/mach-types.h>	33	#include <asm/mach-types.h>
34	#include <asm/mach/arch.h>	34	#include <asm/mach/arch.h>
35	#include <asm/mach/flash.h>	35	#include <asm/mach/flash.h>
36		36
37	#include <asm/arch/gpio.h>	37	#include <mach/gpio.h>
38	#include <asm/arch/led.h>	38	#include <mach/led.h>
39	#include <asm/arch/mux.h>	39	#include <mach/mux.h>
40	#include <asm/arch/usb.h>	40	#include <mach/usb.h>
41	#include <asm/arch/board.h>	41	#include <mach/board.h>
42	#include <asm/arch/common.h>	42	#include <mach/common.h>
43	#include <asm/arch/gpmc.h>	43	#include <mach/gpmc.h>
44	#include <asm/arch/control.h>	44	#include <mach/control.h>
45		45
46	/* LED & Switch macros */	46	/* LED & Switch macros */
47	#define LED0_GPIO13 13	47	#define LED0_GPIO13 13


diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 68ec3a32387a..9ba097868e72 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c
@@ -20,16 +20,16 @@
20	#include <linux/init.h>	20	#include <linux/init.h>
21	#include <linux/device.h>	21	#include <linux/device.h>
22		22
23	#include <asm/arch/hardware.h>	23	#include <mach/hardware.h>
24	#include <asm/mach-types.h>	24	#include <asm/mach-types.h>
25	#include <asm/mach/arch.h>	25	#include <asm/mach/arch.h>
26	#include <asm/mach/map.h>	26	#include <asm/mach/map.h>
27		27
28	#include <asm/arch/gpio.h>	28	#include <mach/gpio.h>
29	#include <asm/arch/mux.h>	29	#include <mach/mux.h>
30	#include <asm/arch/usb.h>	30	#include <mach/usb.h>
31	#include <asm/arch/board.h>	31	#include <mach/board.h>
32	#include <asm/arch/common.h>	32	#include <mach/common.h>
33		33
34	static void __init omap_generic_init_irq(void)	34	static void __init omap_generic_init_irq(void)
35	{	35	{


diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index a32b475dc09c..9e2624ca70a2 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c
@@ -22,24 +22,24 @@
22	#include <linux/err.h>	22	#include <linux/err.h>
23	#include <linux/clk.h>	23	#include <linux/clk.h>
24		24
25	#include <asm/arch/hardware.h>	25	#include <mach/hardware.h>
26	#include <asm/mach-types.h>	26	#include <asm/mach-types.h>
27	#include <asm/mach/arch.h>	27	#include <asm/mach/arch.h>
28	#include <asm/mach/map.h>	28	#include <asm/mach/map.h>
29	#include <asm/mach/flash.h>	29	#include <asm/mach/flash.h>
30		30
31	#include <asm/arch/control.h>	31	#include <mach/control.h>
32	#include <asm/arch/gpio.h>	32	#include <mach/gpio.h>
33	#include <asm/arch/gpioexpander.h>	33	#include <mach/gpioexpander.h>
34	#include <asm/arch/mux.h>	34	#include <mach/mux.h>
35	#include <asm/arch/usb.h>	35	#include <mach/usb.h>
36	#include <asm/arch/irda.h>	36	#include <mach/irda.h>
37	#include <asm/arch/board.h>	37	#include <mach/board.h>
38	#include <asm/arch/common.h>	38	#include <mach/common.h>
39	#include <asm/arch/keypad.h>	39	#include <mach/keypad.h>
40	#include <asm/arch/menelaus.h>	40	#include <mach/menelaus.h>
41	#include <asm/arch/dma.h>	41	#include <mach/dma.h>
42	#include <asm/arch/gpmc.h>	42	#include <mach/gpmc.h>
43		43
44	#include <asm/io.h>	44	#include <asm/io.h>
45		45


diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 15675bce8012..1d891e4a6933 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c
@@ -25,9 +25,9 @@
25		25
26	#include <asm/io.h>	26	#include <asm/io.h>
27		27
28	#include <asm/arch/clock.h>	28	#include <mach/clock.h>
29	#include <asm/arch/sram.h>	29	#include <mach/sram.h>
30	#include <asm/arch/cpu.h>	30	#include <mach/cpu.h>
31	#include <asm/div64.h>	31	#include <asm/div64.h>
32		32
33	#include "memory.h"	33	#include "memory.h"


diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 3cd37cb57c5a..626e5fa93b6a 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h
@@ -16,7 +16,7 @@
16	#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H	16	#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H
17	#define __ARCH_ARM_MACH_OMAP2_CLOCK_H	17	#define __ARCH_ARM_MACH_OMAP2_CLOCK_H
18		18
19	#include <asm/arch/clock.h>	19	#include <mach/clock.h>
20		20
21	/* The maximum error between a target DPLL rate and the rounded rate in Hz */	21	/* The maximum error between a target DPLL rate and the rounded rate in Hz */
22	#define DEFAULT_DPLL_RATE_TOLERANCE 50000	22	#define DEFAULT_DPLL_RATE_TOLERANCE 50000


diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index aa567876651d..295e671e9cfd 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c
@@ -28,8 +28,8 @@
28	#include <linux/io.h>	28	#include <linux/io.h>
29	#include <linux/cpufreq.h>	29	#include <linux/cpufreq.h>
30		30
31	#include <asm/arch/clock.h>	31	#include <mach/clock.h>
32	#include <asm/arch/sram.h>	32	#include <mach/sram.h>
33	#include <asm/div64.h>	33	#include <asm/div64.h>
34	#include <asm/bitops.h>	34	#include <asm/bitops.h>
35		35


diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 4263099b1ad3..3ff74952f835 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c
@@ -26,8 +26,8 @@
26	#include <linux/io.h>	26	#include <linux/io.h>
27	#include <linux/limits.h>	27	#include <linux/limits.h>
28		28
29	#include <asm/arch/clock.h>	29	#include <mach/clock.h>
30	#include <asm/arch/sram.h>	30	#include <mach/sram.h>
31	#include <asm/div64.h>	31	#include <asm/div64.h>
32	#include <asm/bitops.h>	32	#include <asm/bitops.h>
33		33


diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 05757eb032bc..ec664457a11a 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h
@@ -19,7 +19,7 @@
19	#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H	19	#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
20	#define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H	20	#define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
21		21
22	#include <asm/arch/control.h>	22	#include <mach/control.h>
23		23
24	#include "clock.h"	24	#include "clock.h"
25	#include "cm.h"	25	#include "cm.h"


diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 51f70300996f..5f3aad977842 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c
@@ -15,8 +15,8 @@
15	#include <linux/kernel.h>	15	#include <linux/kernel.h>
16	#include <linux/io.h>	16	#include <linux/io.h>
17		17
18	#include <asm/arch/common.h>	18	#include <mach/common.h>
19	#include <asm/arch/control.h>	19	#include <mach/control.h>
20		20
21	static void __iomem *omap2_ctrl_base;	21	static void __iomem *omap2_ctrl_base;
22		22


diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index a6acdcdbb63c..7a7f02559075 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c
@@ -14,15 +14,15 @@
14	#include <linux/init.h>	14	#include <linux/init.h>
15	#include <linux/platform_device.h>	15	#include <linux/platform_device.h>
16		16
17	#include <asm/arch/hardware.h>	17	#include <mach/hardware.h>
18	#include <asm/io.h>	18	#include <asm/io.h>
19	#include <asm/mach-types.h>	19	#include <asm/mach-types.h>
20	#include <asm/mach/map.h>	20	#include <asm/mach/map.h>
21		21
22	#include <asm/arch/tc.h>	22	#include <mach/tc.h>
23	#include <asm/arch/board.h>	23	#include <mach/board.h>
24	#include <asm/arch/mux.h>	24	#include <mach/mux.h>
25	#include <asm/arch/gpio.h>	25	#include <mach/gpio.h>
26		26
27	#if defined(CONFIG_I2C_OMAP) \|\| defined(CONFIG_I2C_OMAP_MODULE)	27	#if defined(CONFIG_I2C_OMAP) \|\| defined(CONFIG_I2C_OMAP_MODULE)
28		28
@@ -142,7 +142,7 @@ static inline void omap_init_sti(void) {}
142		142
143	#if defined(CONFIG_SPI_OMAP24XX)	143	#if defined(CONFIG_SPI_OMAP24XX)
144		144
145	#include <asm/arch/mcspi.h>	145	#include <mach/mcspi.h>
146		146
147	#define OMAP2_MCSPI1_BASE 0x48098000	147	#define OMAP2_MCSPI1_BASE 0x48098000
148	#define OMAP2_MCSPI2_BASE 0x4809a000	148	#define OMAP2_MCSPI2_BASE 0x4809a000


diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index dbf68dc50ae2..f51d69bc457d 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c
@@ -18,7 +18,7 @@
18		18
19	#include <asm/io.h>	19	#include <asm/io.h>
20	#include <asm/mach-types.h>	20	#include <asm/mach-types.h>
21	#include <asm/arch/gpmc.h>	21	#include <mach/gpmc.h>
22		22
23	#undef DEBUG	23	#undef DEBUG
24		24


diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index dff4b16cead6..a5d4526ac4d6 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c
@@ -17,8 +17,8 @@
17		17
18	#include <asm/io.h>	18	#include <asm/io.h>
19		19
20	#include <asm/arch/control.h>	20	#include <mach/control.h>
21	#include <asm/arch/cpu.h>	21	#include <mach/cpu.h>
22		22
23	#if defined(CONFIG_ARCH_OMAP2420)	23	#if defined(CONFIG_ARCH_OMAP2420)
24	#define TAP_BASE io_p2v(0x48014000)	24	#define TAP_BASE io_p2v(0x48014000)


diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 69c8174f3aac..987351f07d7b 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c
@@ -21,8 +21,8 @@
21		21
22	#include <asm/mach/map.h>	22	#include <asm/mach/map.h>
23		23
24	#include <asm/arch/mux.h>	24	#include <mach/mux.h>
25	#include <asm/arch/omapfb.h>	25	#include <mach/omapfb.h>
26		26
27	extern void omap_sram_init(void);	27	extern void omap_sram_init(void);
28	extern int omap2_clk_init(void);	28	extern int omap2_clk_init(void);


diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 6d4c4bf82ad5..9ef15b31d8fc 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c
@@ -13,7 +13,7 @@
13	#include <linux/kernel.h>	13	#include <linux/kernel.h>
14	#include <linux/init.h>	14	#include <linux/init.h>
15	#include <linux/interrupt.h>	15	#include <linux/interrupt.h>
16	#include <asm/arch/hardware.h>	16	#include <mach/hardware.h>
17	#include <asm/mach/irq.h>	17	#include <asm/mach/irq.h>
18	#include <asm/irq.h>	18	#include <asm/irq.h>
19	#include <asm/io.h>	19	#include <asm/io.h>


diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 4799561c5a9e..a480b96948e4 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c
@@ -14,8 +14,8 @@
14	#include <linux/clk.h>	14	#include <linux/clk.h>
15	#include <linux/err.h>	15	#include <linux/err.h>
16	#include <linux/platform_device.h>	16	#include <linux/platform_device.h>
17	#include <asm/arch/mailbox.h>	17	#include <mach/mailbox.h>
18	#include <asm/arch/irqs.h>	18	#include <mach/irqs.h>
19	#include <asm/io.h>	19	#include <asm/io.h>
20		20
21	#define MAILBOX_REVISION 0x00	21	#define MAILBOX_REVISION 0x00


diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 17cf199d1130..27eb6e3ca926 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c
@@ -17,10 +17,10 @@
17	#include <linux/io.h>	17	#include <linux/io.h>
18	#include <linux/platform_device.h>	18	#include <linux/platform_device.h>
19		19
20	#include <asm/arch/dma.h>	20	#include <mach/dma.h>
21	#include <asm/arch/mux.h>	21	#include <mach/mux.h>
22	#include <asm/arch/cpu.h>	22	#include <mach/cpu.h>
23	#include <asm/arch/mcbsp.h>	23	#include <mach/mcbsp.h>
24		24
25	struct mcbsp_internal_clk {	25	struct mcbsp_internal_clk {
26	struct clk clk;	26	struct clk clk;


diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 73cadb2c75cf..6b49cc9cbdcb 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c
@@ -24,9 +24,9 @@
24		24
25	#include <asm/io.h>	25	#include <asm/io.h>
26		26
27	#include <asm/arch/common.h>	27	#include <mach/common.h>
28	#include <asm/arch/clock.h>	28	#include <mach/clock.h>
29	#include <asm/arch/sram.h>	29	#include <mach/sram.h>
30		30
31	#include "prm.h"	31	#include "prm.h"
32		32


diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 8f98b20f30a1..443d07fef7f3 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c
@@ -29,8 +29,8 @@
29	#include <asm/io.h>	29	#include <asm/io.h>
30	#include <linux/spinlock.h>	30	#include <linux/spinlock.h>
31		31
32	#include <asm/arch/control.h>	32	#include <mach/control.h>
33	#include <asm/arch/mux.h>	33	#include <mach/mux.h>
34		34
35	#ifdef CONFIG_OMAP_MUX	35	#ifdef CONFIG_OMAP_MUX
36		36


diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 5e6e595d8eff..8671e1079ab5 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c
@@ -31,10 +31,10 @@
31	#include <asm/mach/time.h>	31	#include <asm/mach/time.h>
32	#include <asm/mach/irq.h>	32	#include <asm/mach/irq.h>
33		33
34	#include <asm/arch/irqs.h>	34	#include <mach/irqs.h>
35	#include <asm/arch/clock.h>	35	#include <mach/clock.h>
36	#include <asm/arch/sram.h>	36	#include <mach/sram.h>
37	#include <asm/arch/pm.h>	37	#include <mach/pm.h>
38		38
39	static struct clk *vclk;	39	static struct clk *vclk;
40	static void (*omap2_sram_idle)(void);	40	static void (*omap2_sram_idle)(void);


diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index fd92a80f38f2..f945156d5585 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c
@@ -18,8 +18,8 @@
18	#include <linux/clk.h>	18	#include <linux/clk.h>
19	#include <linux/io.h>	19	#include <linux/io.h>
20		20
21	#include <asm/arch/common.h>	21	#include <mach/common.h>
22	#include <asm/arch/prcm.h>	22	#include <mach/prcm.h>
23		23
24	#include "clock.h"	24	#include "clock.h"
25	#include "prm.h"	25	#include "prm.h"


diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h index 1b1fe4f6e030..1a8bbd094066 100644 --- a/arch/arm/mach-omap2/sdrc.h +++ b/arch/arm/mach-omap2/sdrc.h
@@ -15,7 +15,7 @@
15	*/	15	*/
16	#undef DEBUG	16	#undef DEBUG
17		17
18	#include <asm/arch/sdrc.h>	18	#include <mach/sdrc.h>
19		19
20	#ifndef __ASSEMBLER__	20	#ifndef __ASSEMBLER__
21	extern void __iomem *omap2_sdrc_base;	21	extern void __iomem *omap2_sdrc_base;


diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index e9c367fc9f61..adc8a26a8fb0 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c
@@ -20,8 +20,8 @@
20		20
21	#include <asm/io.h>	21	#include <asm/io.h>
22		22
23	#include <asm/arch/common.h>	23	#include <mach/common.h>
24	#include <asm/arch/board.h>	24	#include <mach/board.h>
25		25
26	static struct clk * uart1_ick = NULL;	26	static struct clk * uart1_ick = NULL;
27	static struct clk * uart1_fck = NULL;	27	static struct clk * uart1_fck = NULL;


diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S index 46ccb9b8b583..87a706fd5f82 100644 --- a/arch/arm/mach-omap2/sleep.S +++ b/arch/arm/mach-omap2/sleep.S
@@ -23,8 +23,8 @@
23		23
24	#include <linux/linkage.h>	24	#include <linux/linkage.h>
25	#include <asm/assembler.h>	25	#include <asm/assembler.h>
26	#include <asm/arch/io.h>	26	#include <mach/io.h>
27	#include <asm/arch/pm.h>	27	#include <mach/pm.h>
28		28
29	#include "sdrc.h"	29	#include "sdrc.h"
30		30


diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S index 229a9284ed90..af4bd3490227 100644 --- a/arch/arm/mach-omap2/sram242x.S +++ b/arch/arm/mach-omap2/sram242x.S
@@ -24,8 +24,8 @@
24	*/	24	*/
25	#include <linux/linkage.h>	25	#include <linux/linkage.h>
26	#include <asm/assembler.h>	26	#include <asm/assembler.h>
27	#include <asm/arch/io.h>	27	#include <mach/io.h>
28	#include <asm/arch/hardware.h>	28	#include <mach/hardware.h>
29		29
30	#include "prm.h"	30	#include "prm.h"
31	#include "cm.h"	31	#include "cm.h"


diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S index 1665ebb9d7ce..84363e269e8c 100644 --- a/arch/arm/mach-omap2/sram243x.S +++ b/arch/arm/mach-omap2/sram243x.S
@@ -24,8 +24,8 @@
24	*/	24	*/
25	#include <linux/linkage.h>	25	#include <linux/linkage.h>
26	#include <asm/assembler.h>	26	#include <asm/assembler.h>
27	#include <asm/arch/io.h>	27	#include <mach/io.h>
28	#include <asm/arch/hardware.h>	28	#include <mach/hardware.h>
29		29
30	#include "prm.h"	30	#include "prm.h"
31	#include "cm.h"	31	#include "cm.h"


diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 557603f99313..589393bedade 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c
@@ -34,7 +34,7 @@
34	#include <linux/clockchips.h>	34	#include <linux/clockchips.h>
35		35
36	#include <asm/mach/time.h>	36	#include <asm/mach/time.h>
37	#include <asm/arch/dmtimer.h>	37	#include <mach/dmtimer.h>
38		38
39	static struct omap_dm_timer *gptimer;	39	static struct omap_dm_timer *gptimer;
40	static struct clock_event_device clockevent_gpt;	40	static struct clock_event_device clockevent_gpt;


diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 80bb42eb5082..1607c941d95f 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -15,9 +15,9 @@
15		15
16	#include <linux/usb/musb.h>	16	#include <linux/usb/musb.h>
17		17
18	#include <asm/arch/gpmc.h>	18	#include <mach/gpmc.h>
19	#include <asm/arch/gpio.h>	19	#include <mach/gpio.h>
20	#include <asm/arch/mux.h>	20	#include <mach/mux.h>
21		21
22		22
23	static u8 async_cs, sync_cs;	23	static u8 async_cs, sync_cs;