From 7493646fba2d8cd6e19411819079b6229ff54601 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Oct 2012 16:36:40 -0700
Subject: [PATCH] --- yaml --- r: 339654 b: refs/heads/master c:
 1d5aef4950717526d4827e97a916d38d0d73657e h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/arm/mach-omap1/pm_bus.c                            | 2 --
 trunk/arch/arm/mach-omap2/board-rx51-peripherals.c            | 2 +-
 trunk/arch/arm/mach-omap2/display.c                           | 2 +-
 trunk/arch/arm/mach-omap2/dsp.c                               | 2 +-
 trunk/arch/arm/mach-omap2/gpio.c                              | 2 +-
 trunk/arch/arm/mach-omap2/hsmmc.c                             | 2 +-
 trunk/arch/arm/mach-omap2/io.c                                | 2 +-
 .../arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h | 0
 trunk/arch/arm/mach-omap2/pm-debug.c                          | 2 +-
 trunk/arch/arm/mach-omap2/pm.c                                | 2 +-
 trunk/arch/arm/mach-omap2/serial.c                            | 2 +-
 trunk/arch/arm/mach-omap2/timer.c                             | 2 +-
 trunk/arch/arm/plat-omap/dmtimer.c                            | 3 ++-
 trunk/arch/arm/plat-omap/omap-pm-noop.c                       | 4 +---
 trunk/drivers/media/rc/ir-rx51.c                              | 1 -
 16 files changed, 14 insertions(+), 18 deletions(-)
 rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%)

diff --git a/[refs] b/[refs]
index d2b5c59e04b3..ead124b9fe29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc843280c954877b8a196e59a9f92cd8b94c2d25
+refs/heads/master: 1d5aef4950717526d4827e97a916d38d0d73657e
diff --git a/trunk/arch/arm/mach-omap1/pm_bus.c b/trunk/arch/arm/mach-omap1/pm_bus.c
index 8a74ec5e3de2..16bf2f95117c 100644
--- a/trunk/arch/arm/mach-omap1/pm_bus.c
+++ b/trunk/arch/arm/mach-omap1/pm_bus.c
@@ -19,8 +19,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 
-#include <plat/omap-pm.h>
-
 #ifdef CONFIG_PM_RUNTIME
 static int omap1_pm_runtime_suspend(struct device *dev)
 {
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
index c2eed847c05b..07005fe40a2a 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 #include <plat-omap/dma-omap.h>
-#include <plat/omap-pm.h>
 #include "gpmc-smc91x.h"
 
 #include "board-rx51.h"
@@ -51,6 +50,7 @@
 #endif
 
 #include "mux.h"
+#include "omap-pm.h"
 #include "hsmmc.h"
 #include "common-board-devices.h"
 #include "gpmc.h"
diff --git a/trunk/arch/arm/mach-omap2/display.c b/trunk/arch/arm/mach-omap2/display.c
index 815af41c4375..9aaaf4e03ca3 100644
--- a/trunk/arch/arm/mach-omap2/display.c
+++ b/trunk/arch/arm/mach-omap2/display.c
@@ -27,7 +27,7 @@
 #include <video/omapdss.h>
 #include "omap_hwmod.h"
 #include "omap_device.h"
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 #include "common.h"
 
 #include "iomap.h"
diff --git a/trunk/arch/arm/mach-omap2/dsp.c b/trunk/arch/arm/mach-omap2/dsp.c
index 98388109f22a..b155500e84a8 100644
--- a/trunk/arch/arm/mach-omap2/dsp.c
+++ b/trunk/arch/arm/mach-omap2/dsp.c
@@ -27,7 +27,7 @@
 #include "cm2xxx_3xxx.h"
 #include "prm2xxx_3xxx.h"
 #ifdef CONFIG_BRIDGE_DVFS
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 #endif
 
 #include <linux/platform_data/dsp-omap.h>
diff --git a/trunk/arch/arm/mach-omap2/gpio.c b/trunk/arch/arm/mach-omap2/gpio.c
index 80b1e1a05ce2..399acabc3d0b 100644
--- a/trunk/arch/arm/mach-omap2/gpio.c
+++ b/trunk/arch/arm/mach-omap2/gpio.c
@@ -25,7 +25,7 @@
 
 #include "omap_hwmod.h"
 #include "omap_device.h"
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 
 #include "powerdomain.h"
 
diff --git a/trunk/arch/arm/mach-omap2/hsmmc.c b/trunk/arch/arm/mach-omap2/hsmmc.c
index 797e8c6a4130..ddbf2eb6ba5b 100644
--- a/trunk/arch/arm/mach-omap2/hsmmc.c
+++ b/trunk/arch/arm/mach-omap2/hsmmc.c
@@ -17,8 +17,8 @@
 #include <mach/hardware.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <plat/omap-pm.h>
 #include "omap_device.h"
+#include "omap-pm.h"
 
 #include "mux.h"
 #include "mmc.h"
diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c
index b373cb59845c..80d1cf17af8c 100644
--- a/trunk/arch/arm/mach-omap2/io.c
+++ b/trunk/arch/arm/mach-omap2/io.c
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/serial.h>
-#include <plat/omap-pm.h>
 #include <plat-omap/dma-omap.h>
 
 #include "../plat-omap/sram.h"
@@ -42,6 +41,7 @@
 #include "clock2xxx.h"
 #include "clock3xxx.h"
 #include "clock44xx.h"
+#include "omap-pm.h"
 #include "sdrc.h"
 
 /*
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap-pm.h b/trunk/arch/arm/mach-omap2/omap-pm.h
similarity index 100%
rename from trunk/arch/arm/plat-omap/include/plat/omap-pm.h
rename to trunk/arch/arm/mach-omap2/omap-pm.h
diff --git a/trunk/arch/arm/mach-omap2/pm-debug.c b/trunk/arch/arm/mach-omap2/pm-debug.c
index 46092cd806fa..b91283edf415 100644
--- a/trunk/arch/arm/mach-omap2/pm-debug.c
+++ b/trunk/arch/arm/mach-omap2/pm-debug.c
@@ -31,7 +31,7 @@
 #include "powerdomain.h"
 #include "clockdomain.h"
 #include <plat/dmtimer.h>
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 
 #include "cm2xxx_3xxx.h"
 #include "prm2xxx_3xxx.h"
diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c
index 4f749a1e3aa2..e66855ef4c78 100644
--- a/trunk/arch/arm/mach-omap2/pm.c
+++ b/trunk/arch/arm/mach-omap2/pm.c
@@ -20,7 +20,7 @@
 
 #include <asm/system_misc.h>
 
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 #include "omap_device.h"
 #include "common.h"
 
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
index a4fb791be2da..a3da4654de97 100644
--- a/trunk/arch/arm/mach-omap2/serial.c
+++ b/trunk/arch/arm/mach-omap2/serial.c
@@ -29,12 +29,12 @@
 
 #include <plat/omap-serial.h>
 #include <plat-omap/dma-omap.h>
-#include <plat/omap-pm.h>
 #include <plat/serial.h>
 
 #include "common.h"
 #include "omap_hwmod.h"
 #include "omap_device.h"
+#include "omap-pm.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 b11df8230145..45598ac819be 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -46,7 +46,7 @@
 #include "omap_hwmod.h"
 #include "omap_device.h"
 #include <plat/dmtimer.h>
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
 
 #include "soc.h"
 #include "common.h"
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
index 938b50a33439..4a0b30a4ebda 100644
--- a/trunk/arch/arm/plat-omap/dmtimer.c
+++ b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -42,10 +42,11 @@
 #include <linux/pm_runtime.h>
 
 #include <plat/dmtimer.h>
-#include <plat/omap-pm.h>
 
 #include <mach/hardware.h>
 
+#include "../mach-omap2/omap-pm.h"
+
 static u32 omap_reserved_systimers;
 static LIST_HEAD(omap_timer_list);
 static DEFINE_SPINLOCK(dm_timer_lock);
diff --git a/trunk/arch/arm/plat-omap/omap-pm-noop.c b/trunk/arch/arm/plat-omap/omap-pm-noop.c
index 3c96b567370e..198685b894b0 100644
--- a/trunk/arch/arm/plat-omap/omap-pm-noop.c
+++ b/trunk/arch/arm/plat-omap/omap-pm-noop.c
@@ -22,10 +22,8 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 
-/* Interface documentation is in mach/omap-pm.h */
-#include <plat/omap-pm.h>
-
 #include "../mach-omap2/omap_device.h"
+#include "../mach-omap2/omap-pm.h"
 
 static bool off_mode_enabled;
 static int dummy_context_loss_counter;
diff --git a/trunk/drivers/media/rc/ir-rx51.c b/trunk/drivers/media/rc/ir-rx51.c
index 546199e9ccc7..82e6c1e282d5 100644
--- a/trunk/drivers/media/rc/ir-rx51.c
+++ b/trunk/drivers/media/rc/ir-rx51.c
@@ -28,7 +28,6 @@
 
 #include <plat/dmtimer.h>
 #include <plat/clock.h>
-#include <plat/omap-pm.h>
 
 #include <media/lirc.h>
 #include <media/lirc_dev.h>