aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/omap-pm-noop.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-03 16:36:40 -0700
committerTony Lindgren <tony@atomide.com>2012-10-18 16:22:08 -0700
commit1d5aef4950717526d4827e97a916d38d0d73657e (patch)
tree8639e16a1debc85c0c96de402616c5c4510ddec8 /arch/arm/plat-omap/omap-pm-noop.c
parentARM: OMAP: Merge plat/multi.h into plat/cpu.h (diff)
downloadlinux-dev-1d5aef4950717526d4827e97a916d38d0d73657e.tar.xz
linux-dev-1d5aef4950717526d4827e97a916d38d0d73657e.zip
ARM: OMAP: Make plat/omap-pm.h local to mach-omap2
We must move this for ARM common zImage support. Note that neither drivers/media/rc/ir-rx51.c or drivers/media/platform/omap3isp/ispvideo.c need to include omap-pm.h, so this patch removes the include for those files. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Timo Kokkonen <timo.t.kokkonen@iki.fi> Cc: linux-media@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/omap-pm-noop.c')
-rw-r--r--arch/arm/plat-omap/omap-pm-noop.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c
index 3c96b567370e..198685b894b0 100644
--- a/arch/arm/plat-omap/omap-pm-noop.c
+++ b/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;