From mboxrd@z Thu Jan 1 00:00:00 1970 From: Omar Ramirez Luna Subject: [PATCHv2 18/18] DSPBRIDGE: Compilation fixes 2.6.31 Date: Wed, 16 Dec 2009 20:16:03 -0600 Message-ID: <1261016163-11091-19-git-send-email-omar.ramirez@ti.com> References: <1261016163-11091-1-git-send-email-omar.ramirez@ti.com> <1261016163-11091-2-git-send-email-omar.ramirez@ti.com> <1261016163-11091-3-git-send-email-omar.ramirez@ti.com> <1261016163-11091-4-git-send-email-omar.ramirez@ti.com> <1261016163-11091-5-git-send-email-omar.ramirez@ti.com> <1261016163-11091-6-git-send-email-omar.ramirez@ti.com> <1261016163-11091-7-git-send-email-omar.ramirez@ti.com> <1261016163-11091-8-git-send-email-omar.ramirez@ti.com> <1261016163-11091-9-git-send-email-omar.ramirez@ti.com> <1261016163-11091-10-git-send-email-omar.ramirez@ti.com> <1261016163-11091-11-git-send-email-omar.ramirez@ti.com> <1261016163-11091-12-git-send-email-omar.ramirez@ti.com> <1261016163-11091-13-git-send-email-omar.ramirez@ti.com> <1261016163-11091-14-git-send-email-omar.ramirez@ti.com> <1261016163-11091-15-git-send-email-omar.ramirez@ti.com> <1261016163-11091-16-git-send-email-omar.ramirez@ti.com> <1261016163-11091-17-git-send-email-omar.ramirez@ti.com> <1261016163-11091-18-git-send-email-omar.ramirez@ti.com> Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:57401 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763904AbZLQCIs (ORCPT ); Wed, 16 Dec 2009 21:08:48 -0500 In-Reply-To: <1261016163-11091-18-git-send-email-omar.ramirez@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap Cc: Hiroshi Doyu , Ameya Palande , Felipe Contreras , Fernando Guzman , Ernesto Ramos , Omar Ramirez Luna Compilation fixes 2.6.31 board-sdp3430.h not found clk_handle undefined because of DVFS flag Signed-off-by: Omar Ramirez Luna --- arch/arm/mach-omap2/dspbridge.c | 2 ++ drivers/dsp/bridge/rmgr/drv_interface.c | 8 ++++---- drivers/dsp/bridge/rmgr/proc.c | 3 +++ drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 3 --- 4 files changed, 9 insertions(+), 7 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 +#ifdef CONFIG_BRIDGE_DVFS #include +#endif #include diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 6415955..16529d8 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -59,8 +59,6 @@ #include #include -#include - /* ----------------------------------- DSP/BIOS Bridge */ #include #include @@ -96,8 +94,10 @@ #include #endif +#ifdef CONFIG_BRIDGE_DVFS #include #include +#endif #define BRIDGE_NAME "C6410" /* ----------------------------------- Globals */ @@ -458,10 +458,10 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) driverContext = 0; DBC_Assert(ret == true); } - +#ifdef CONFIG_BRIDGE_DVFS clk_put(clk_handle); clk_handle = NULL; - +#endif func_cont: MEM_ExtPhysPoolRelease(); diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index 1ab6181..f4f756c 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -142,7 +142,10 @@ /* ----------------------------------- This */ #include #include + +#ifdef CONFIG_BRIDGE_DVFS #include +#endif #ifndef RES_CLEANUP_DISABLE #include diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index ea299a0..00202e1 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -66,9 +66,6 @@ #include #include -#ifdef CONFIG_PM -#include -#endif extern s32 dsp_test_sleepstate; extern struct MAILBOX_CONTEXT mboxsetting; -- 1.6.2.4