From 6cb62a61ca328a95574f853cbe26934e73561446 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 2 Oct 2012 17:41:35 -0700
Subject: [PATCH] --- yaml --- r: 339652 b: refs/heads/master c:
 2a296c8f89bc6aaf91b255c7d631fcbbfaf840ec h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/arm/mach-omap2/clockdomain.h                     | 2 +-
 trunk/arch/arm/mach-omap2/devices.c                         | 5 +++--
 trunk/arch/arm/mach-omap2/display.c                         | 2 +-
 trunk/arch/arm/mach-omap2/dma.c                             | 2 +-
 trunk/arch/arm/mach-omap2/drm.c                             | 2 +-
 trunk/arch/arm/mach-omap2/gpio.c                            | 2 +-
 trunk/arch/arm/mach-omap2/hdq1w.c                           | 2 +-
 trunk/arch/arm/mach-omap2/hdq1w.h                           | 2 +-
 trunk/arch/arm/mach-omap2/hwspinlock.c                      | 2 +-
 trunk/arch/arm/mach-omap2/i2c.c                             | 2 +-
 trunk/arch/arm/mach-omap2/io.c                              | 2 +-
 trunk/arch/arm/mach-omap2/msdi.c                            | 2 +-
 trunk/arch/arm/mach-omap2/mux.c                             | 2 +-
 trunk/arch/arm/mach-omap2/omap_device.c                     | 2 +-
 trunk/arch/arm/mach-omap2/omap_device.h                     | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c                      | 2 +-
 .../arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h | 0
 trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c            | 3 ++-
 trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c            | 3 ++-
 .../arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c | 3 ++-
 .../arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 5 ++++-
 .../arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 3 ++-
 trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c    | 3 ++-
 trunk/arch/arm/mach-omap2/omap_hwmod_33xx_data.c            | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c            | 3 ++-
 trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c            | 3 ++-
 trunk/arch/arm/mach-omap2/omap_hwmod_common_data.c          | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod_common_data.h          | 2 +-
 trunk/arch/arm/mach-omap2/omap_opp_data.h                   | 2 +-
 trunk/arch/arm/mach-omap2/pmu.c                             | 2 +-
 trunk/arch/arm/mach-omap2/serial.c                          | 6 +++---
 trunk/arch/arm/mach-omap2/timer.c                           | 2 +-
 trunk/arch/arm/mach-omap2/wd_timer.c                        | 2 +-
 trunk/arch/arm/mach-omap2/wd_timer.h                        | 2 +-
 35 files changed, 48 insertions(+), 37 deletions(-)
 rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (100%)

diff --git a/[refs] b/[refs]
index edf53ea66984..5592b5c0f14c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ba30f0f23d277dec2a53ad6ccaa2f2c6e994fc8
+refs/heads/master: 2a296c8f89bc6aaf91b255c7d631fcbbfaf840ec
diff --git a/trunk/arch/arm/mach-omap2/clockdomain.h b/trunk/arch/arm/mach-omap2/clockdomain.h
index 629576be7444..a868c0296265 100644
--- a/trunk/arch/arm/mach-omap2/clockdomain.h
+++ b/trunk/arch/arm/mach-omap2/clockdomain.h
@@ -19,7 +19,7 @@
 
 #include "powerdomain.h"
 #include <plat/clock.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/cpu.h>
 
 /*
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
index 48c0def2dbc2..86a5e13c9f59 100644
--- a/trunk/arch/arm/mach-omap2/devices.c
+++ b/trunk/arch/arm/mach-omap2/devices.c
@@ -23,9 +23,10 @@
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include "iomap.h"
 #include <plat-omap/dma-omap.h>
-#include <plat/omap_hwmod.h>
+
+#include "iomap.h"
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "omap4-keypad.h"
 
diff --git a/trunk/arch/arm/mach-omap2/display.c b/trunk/arch/arm/mach-omap2/display.c
index 55661d00423c..815af41c4375 100644
--- a/trunk/arch/arm/mach-omap2/display.c
+++ b/trunk/arch/arm/mach-omap2/display.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 
 #include <video/omapdss.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/omap-pm.h>
 #include "common.h"
diff --git a/trunk/arch/arm/mach-omap2/dma.c b/trunk/arch/arm/mach-omap2/dma.c
index 7ddc6c90ed71..bc9a4e941e59 100644
--- a/trunk/arch/arm/mach-omap2/dma.c
+++ b/trunk/arch/arm/mach-omap2/dma.c
@@ -28,9 +28,9 @@
 #include <linux/init.h>
 #include <linux/device.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 #define OMAP2_DMA_STRIDE	0x60
diff --git a/trunk/arch/arm/mach-omap2/drm.c b/trunk/arch/arm/mach-omap2/drm.c
index 67991ea53ce7..6282cc826613 100644
--- a/trunk/arch/arm/mach-omap2/drm.c
+++ b/trunk/arch/arm/mach-omap2/drm.c
@@ -25,7 +25,7 @@
 #include <linux/dma-mapping.h>
 
 #include "omap_device.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
 
diff --git a/trunk/arch/arm/mach-omap2/gpio.c b/trunk/arch/arm/mach-omap2/gpio.c
index 2bd24671bcf6..80b1e1a05ce2 100644
--- a/trunk/arch/arm/mach-omap2/gpio.c
+++ b/trunk/arch/arm/mach-omap2/gpio.c
@@ -23,7 +23,7 @@
 #include <linux/of.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/omap-pm.h>
 
diff --git a/trunk/arch/arm/mach-omap2/hdq1w.c b/trunk/arch/arm/mach-omap2/hdq1w.c
index a533ce33d112..3da8900598c8 100644
--- a/trunk/arch/arm/mach-omap2/hdq1w.c
+++ b/trunk/arch/arm/mach-omap2/hdq1w.c
@@ -27,7 +27,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "hdq1w.h"
 
diff --git a/trunk/arch/arm/mach-omap2/hdq1w.h b/trunk/arch/arm/mach-omap2/hdq1w.h
index 0c1efc846d8d..c7e08d2a7a46 100644
--- a/trunk/arch/arm/mach-omap2/hdq1w.h
+++ b/trunk/arch/arm/mach-omap2/hdq1w.h
@@ -21,7 +21,7 @@
 #ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H
 #define ARCH_ARM_MACH_OMAP2_HDQ1W_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 /*
  * XXX A future cleanup patch should modify
diff --git a/trunk/arch/arm/mach-omap2/hwspinlock.c b/trunk/arch/arm/mach-omap2/hwspinlock.c
index 58565214b428..1df9b5feda16 100644
--- a/trunk/arch/arm/mach-omap2/hwspinlock.c
+++ b/trunk/arch/arm/mach-omap2/hwspinlock.c
@@ -21,7 +21,7 @@
 #include <linux/err.h>
 #include <linux/hwspinlock.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
diff --git a/trunk/arch/arm/mach-omap2/i2c.c b/trunk/arch/arm/mach-omap2/i2c.c
index 84b0d9f25a7b..8b3993724a1b 100644
--- a/trunk/arch/arm/mach-omap2/i2c.c
+++ b/trunk/arch/arm/mach-omap2/i2c.c
@@ -20,7 +20,7 @@
  */
 
 #include "common.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 #include "mux.h"
diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c
index 0bc8f66c4b72..60dede839a35 100644
--- a/trunk/arch/arm/mach-omap2/io.c
+++ b/trunk/arch/arm/mach-omap2/io.c
@@ -27,7 +27,7 @@
 
 #include <plat/serial.h>
 #include <plat/omap-pm.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/multi.h>
 #include <plat-omap/dma-omap.h>
 
diff --git a/trunk/arch/arm/mach-omap2/msdi.c b/trunk/arch/arm/mach-omap2/msdi.c
index 46bf98a99180..627e97e30743 100644
--- a/trunk/arch/arm/mach-omap2/msdi.c
+++ b/trunk/arch/arm/mach-omap2/msdi.c
@@ -25,9 +25,9 @@
 #include <linux/err.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include "common.h"
 #include "control.h"
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include "mux.h"
 #include "mmc.h"
diff --git a/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c
index 701e17cba468..635d5ef9551c 100644
--- a/trunk/arch/arm/mach-omap2/mux.c
+++ b/trunk/arch/arm/mach-omap2/mux.c
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "control.h"
 #include "mux.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_device.c b/trunk/arch/arm/mach-omap2/omap_device.c
index e5fbcb53c7cc..2e6d33730b25 100644
--- a/trunk/arch/arm/mach-omap2/omap_device.c
+++ b/trunk/arch/arm/mach-omap2/omap_device.c
@@ -90,7 +90,7 @@
 #include <linux/notifier.h>
 
 #include "omap_device.h"
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/clock.h>
 
 /* These parameters are passed to _omap_device_{de,}activate() */
diff --git a/trunk/arch/arm/mach-omap2/omap_device.h b/trunk/arch/arm/mach-omap2/omap_device.h
index 106f50665804..0933c599bf89 100644
--- a/trunk/arch/arm/mach-omap2/omap_device.h
+++ b/trunk/arch/arm/mach-omap2/omap_device.h
@@ -34,7 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 extern struct dev_pm_domain omap_device_pm_domain;
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index b969ab1d258b..3dc482a1a75f 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -140,7 +140,7 @@
 #include <linux/bootmem.h>
 
 #include <plat/clock.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/prcm.h>
 
 #include "soc.h"
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h b/trunk/arch/arm/mach-omap2/omap_hwmod.h
similarity index 100%
rename from trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h
rename to trunk/arch/arm/mach-omap2/omap_hwmod.h
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 95a0053b6ae1..3efed3d633d1 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -16,9 +16,10 @@
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
+
+#include "omap_hwmod.h"
 #include "l3_2xxx.h"
 #include "l4_2xxx.h"
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index a6c24aea28b6..dc768c50e523 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -17,9 +17,10 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
+
+#include "omap_hwmod.h"
 #include "mmc.h"
 #include "l3_2xxx.h"
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
index cbb4ef6544ad..74ae76767510 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
@@ -13,9 +13,10 @@
  */
 #include <asm/sizes.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat/serial.h>
 
+#include "omap_hwmod.h"
+
 #include "omap_hwmod_common_data.h"
 
 struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index bfe64ee20606..57fc2f95584d 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -9,10 +9,13 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <plat/omap_hwmod.h>
+
 #include <plat/serial.h>
 #include <plat-omap/dma-omap.h>
+
 #include "../plat-omap/common.h"
+
+#include "omap_hwmod.h"
 #include "hdq1w.h"
 
 #include "omap_hwmod_common_data.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
index 1a1287d62648..dd3809c8f409 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@ -13,8 +13,9 @@
  */
 #include <asm/sizes.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat/serial.h>
+
+#include "omap_hwmod.h"
 #include "l3_2xxx.h"
 #include "l4_2xxx.h"
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index b9024868774c..27bdff46fda0 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -8,13 +8,14 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <plat/omap_hwmod.h>
+
 #include <plat/serial.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "cm-regbits-24xx.h"
 #include "prm-regbits-24xx.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index cb7c393c08de..60ed43531079 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -16,7 +16,7 @@
 
 #include <linux/i2c-omap.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include <plat/cpu.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 14451217dac2..d5d52a776278 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -19,9 +19,9 @@
 #include <linux/power/smartreflex.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
 #include <plat/serial.h>
+
 #include "l3_3xxx.h"
 #include "l4_3xxx.h"
 #include <linux/platform_data/asoc-ti-mcbsp.h>
@@ -32,6 +32,7 @@
 #include "am35xx.h"
 
 #include "soc.h"
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "prm-regbits-34xx.h"
 #include "cm-regbits-34xx.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0cee55135e29..5b9be734709c 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -23,8 +23,8 @@
 #include <linux/power/smartreflex.h>
 #include <linux/i2c-omap.h>
 
-#include <plat/omap_hwmod.h>
 #include <plat-omap/dma-omap.h>
+
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <plat/dmtimer.h>
@@ -32,6 +32,7 @@
 
 #include "../plat-omap/common.h"
 
+#include "omap_hwmod.h"
 #include "omap_hwmod_common_data.h"
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.c
index 9f1ccdc8cc8c..79d623b83e49 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.c
@@ -16,7 +16,7 @@
  * data and their integration with other OMAP modules and Linux.
  */
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "omap_hwmod_common_data.h"
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.h b/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.h
index 2bc8f1705d4a..cfcce299177c 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.h
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_common_data.h
@@ -13,7 +13,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
 #define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "common.h"
 #include "display.h"
diff --git a/trunk/arch/arm/mach-omap2/omap_opp_data.h b/trunk/arch/arm/mach-omap2/omap_opp_data.h
index c784c12f98a1..7e437bf6024c 100644
--- a/trunk/arch/arm/mach-omap2/omap_opp_data.h
+++ b/trunk/arch/arm/mach-omap2/omap_opp_data.h
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
 #define __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "voltage.h"
 
diff --git a/trunk/arch/arm/mach-omap2/pmu.c b/trunk/arch/arm/mach-omap2/pmu.c
index 4b3230fe228a..98c5969acf6d 100644
--- a/trunk/arch/arm/mach-omap2/pmu.c
+++ b/trunk/arch/arm/mach-omap2/pmu.c
@@ -15,7 +15,7 @@
 
 #include <asm/pmu.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 
 static char *omap2_pmu_oh_names[] = {"mpu"};
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index 5df6dd96fd5c..a4fb791be2da 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -28,13 +28,13 @@
 #include <linux/console.h>
 
 #include <plat/omap-serial.h>
-#include "common.h"
 #include <plat-omap/dma-omap.h>
-#include <plat/omap_hwmod.h>
-#include "omap_device.h"
 #include <plat/omap-pm.h>
 #include <plat/serial.h>
 
+#include "common.h"
+#include "omap_hwmod.h"
+#include "omap_device.h"
 #include "prm2xxx_3xxx.h"
 #include "pm.h"
 #include "cm2xxx_3xxx.h"
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index a2ea2f30f7c9..b11df8230145 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -43,7 +43,7 @@
 #include <asm/sched_clock.h>
 
 #include <asm/arch_timer.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/dmtimer.h>
 #include <plat/omap-pm.h>
diff --git a/trunk/arch/arm/mach-omap2/wd_timer.c b/trunk/arch/arm/mach-omap2/wd_timer.c
index b2f1c67043a2..f6b6c37ac3f4 100644
--- a/trunk/arch/arm/mach-omap2/wd_timer.c
+++ b/trunk/arch/arm/mach-omap2/wd_timer.c
@@ -11,7 +11,7 @@
 #include <linux/io.h>
 #include <linux/err.h>
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 #include "wd_timer.h"
 #include "common.h"
diff --git a/trunk/arch/arm/mach-omap2/wd_timer.h b/trunk/arch/arm/mach-omap2/wd_timer.h
index f6bbba73b535..a78f81034a9f 100644
--- a/trunk/arch/arm/mach-omap2/wd_timer.h
+++ b/trunk/arch/arm/mach-omap2/wd_timer.h
@@ -10,7 +10,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
 #define __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
 
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
 
 extern int omap2_wd_timer_disable(struct omap_hwmod *oh);
 extern int omap2_wd_timer_reset(struct omap_hwmod *oh);