Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d5aef49 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarLaurent 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: default avatarTony Lindgren <tony@atomide.com>
parent dc843280

arch/arm/mach-omap1/pm_bus.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include "common.h"

#include <plat-omap/dma-omap.h>

#include <plat/omap-pm.h>

#include "gpmc-smc91x.h"



#include "board-rx51.h"
@@ -51,6 +50,7 @@ 
#endif



#include "mux.h"

#include "omap-pm.h"

#include "hsmmc.h"

#include "common-board-devices.h"

#include "gpmc.h"

arch/arm/mach-omap2/display.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-omap2/dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "cm2xxx_3xxx.h"

#include "prm2xxx_3xxx.h"

#ifdef CONFIG_BRIDGE_DVFS

#include <plat/omap-pm.h>

#include "omap-pm.h"

#endif



#include <linux/platform_data/dsp-omap.h>

arch/arm/mach-omap2/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "omap_hwmod.h"

#include "omap_device.h"

#include <plat/omap-pm.h>

#include "omap-pm.h"



#include "powerdomain.h"