Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- arch/arm/mach-omap2/dspbridge.c | 2 ++ drivers/dsp/bridge/rmgr/drv_interface.c | 5 ++++- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/dspbridge.c b/arch/arm/mach-omap2/dspbridge.c index 9724a95..ea109a3 100644 --- a/arch/arm/mach-omap2/dspbridge.c +++ b/arch/arm/mach-omap2/dspbridge.c @@ -13,7 +13,9 @@ #include <linux/platform_device.h> +#ifdef CONFIG_BRIDGE_DVFS #include <mach/omap-pm.h> +#endif #include <dspbridge/host_os.h> diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 6415955..90d4bad 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -96,8 +96,10 @@ #include <dspbridge/drv.h> #endif +#ifdef CONFIG_BRIDGE_DVFS #include <mach/omap-pm.h> #include <mach-omap2/omap3-opp.h> +#endif #define BRIDGE_NAME "C6410" /* ----------------------------------- Globals */ @@ -147,7 +149,6 @@ static int omap34xxbridge_suspend_lockout( } return 0; } - #endif #ifdef DEBUG @@ -459,8 +460,10 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) DBC_Assert(ret == true); } +#ifdef CONFIG_BRIDGE_DVFS clk_put(clk_handle); clk_handle = NULL; +#endif /* #ifdef CONFIG_BRIDGE_DVFS */ func_cont: MEM_ExtPhysPoolRelease(); diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index ea299a0..8a0cb02 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -68,8 +68,8 @@ #ifdef CONFIG_PM #include <mach/board-3430sdp.h> -#endif extern s32 dsp_test_sleepstate; +#endif extern struct MAILBOX_CONTEXT mboxsetting; /* -- 1.6.6.rc2.5.g49666 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
