diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-03 19:36:40 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 19:22:08 -0400 |
commit | 1d5aef4950717526d4827e97a916d38d0d73657e (patch) | |
tree | 8639e16a1debc85c0c96de402616c5c4510ddec8 /arch/arm/mach-omap2/timer.c | |
parent | dc843280c954877b8a196e59a9f92cd8b94c2d25 (diff) |
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/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b11df8230145..45598ac819be 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "omap_hwmod.h" | 46 | #include "omap_hwmod.h" |
47 | #include "omap_device.h" | 47 | #include "omap_device.h" |
48 | #include <plat/dmtimer.h> | 48 | #include <plat/dmtimer.h> |
49 | #include <plat/omap-pm.h> | 49 | #include "omap-pm.h" |
50 | 50 | ||
51 | #include "soc.h" | 51 | #include "soc.h" |
52 | #include "common.h" | 52 | #include "common.h" |