[1/4] dspbridge: fix build when OMAP_MCBSP=n

Commit Message

Felipe Contreras May 16, 2010, 3:44 p.m. UTC

None

Patch

diff --git a/drivers/dsp/bridge/core/dsp-clock.c b/drivers/dsp/bridge/core/dsp-clock.c
index 3683dc3..7df100a 100644
--- a/drivers/dsp/bridge/core/dsp-clock.c
+++ b/drivers/dsp/bridge/core/dsp-clock.c
@@ -147,6 +147,7 @@  void dsp_clk_init(void)
 					ssi.sst_fck, ssi.ssr_fck, ssi.ick);
 }
 
+#ifdef CONFIG_OMAP_MCBSP
 static void mcbsp_clk_prepare(bool flag, u8 id)
 {
 	struct cfg_hostres *resources;
@@ -192,6 +193,7 @@  static void mcbsp_clk_prepare(bool flag, u8 id)
 		}
 	}
 }
+#endif
 
 /*
  *  ======== dsp_clk_enable ========
@@ -215,11 +217,13 @@  dsp_status dsp_clk_enable(IN enum dsp_clk_id clk_id)
 	case GPT_CLK:
 		timer[clk_id] = omap_dm_timer_request_specific(DMT_ID(clk_id));
 		break;
+#ifdef CONFIG_OMAP_MCBSP
 	case MCBSP_CLK:
 		mcbsp_clk_prepare(true, clk_id);
 		omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO);
 		omap_mcbsp_request(MCBSP_ID(clk_id));
 		break;
+#endif
 	case WDT_CLK:
 		dev_err(bridge, "ERROR: DSP requested to enable WDT3 clk\n");
 		break;
@@ -290,10 +294,12 @@  dsp_status dsp_clk_disable(IN enum dsp_clk_id clk_id)
 	case GPT_CLK:
 		omap_dm_timer_free(timer[clk_id]);
 		break;
+#ifdef CONFIG_OMAP_MCBSP
 	case MCBSP_CLK:
 		mcbsp_clk_prepare(false, clk_id);
 		omap_mcbsp_free(MCBSP_ID(clk_id));
 		break;
+#endif
 	case WDT_CLK:
 		dev_err(bridge, "ERROR: DSP requested to disable WDT3 clk\n");
 		break;