summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-04 01:36:40 +0200
committerTony Lindgren <tony@atomide.com>2012-10-19 01:22:08 +0200
commit1d5aef4950717526d4827e97a916d38d0d73657e (patch)
tree8639e16a1debc85c0c96de402616c5c4510ddec8 /arch/arm/mach-omap1
parentARM: OMAP: Merge plat/multi.h into plat/cpu.h (diff)
downloadlinux-1d5aef4950717526d4827e97a916d38d0d73657e.tar.xz
linux-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/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/pm_bus.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 8a74ec5e3de2..16bf2f95117c 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/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)
{