diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-03 16:36:40 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 16:22:08 -0700 |
| commit | 1d5aef4950717526d4827e97a916d38d0d73657e (patch) | |
| tree | 8639e16a1debc85c0c96de402616c5c4510ddec8 /arch/arm/plat-omap/dmtimer.c | |
| parent | dc843280c954877b8a196e59a9f92cd8b94c2d25 (diff) | |
| download | lwn-1d5aef4950717526d4827e97a916d38d0d73657e.tar.gz lwn-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/dmtimer.c')
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 938b50a33439..4a0b30a4ebda 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/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); |