summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/display.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-04 03:36:40 +0400
committerTony Lindgren <tony@atomide.com>2012-10-19 03:22:08 +0400
commit1d5aef4950717526d4827e97a916d38d0d73657e (patch)
tree8639e16a1debc85c0c96de402616c5c4510ddec8 /arch/arm/mach-omap2/display.c
parentdc843280c954877b8a196e59a9f92cd8b94c2d25 (diff)
downloadlinux-1d5aef4950717526d4827e97a916d38d0d73657e.tar.xz
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-omap2/display.c')
-rw-r--r--arch/arm/mach-omap2/display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 815af41c4375..9aaaf4e03ca3 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/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"