From 758b1c23c8aff3f005ccf0376216bd04ae4bc9b9 Mon Sep 17 00:00:00 2001 From: Arun KS Date: Thu, 23 Apr 2009 21:11:07 -0600 Subject: [PATCH] --- yaml --- r: 144495 b: refs/heads/master c: d53eb73795c55101453ea6ca4f486ea2ff7b0496 h: refs/heads/master i: 144493: 8b949ad5647972d4813cc3b083cf50624237fcd3 144491: 0d5ae5fd3096e3c74a7c599067b18066e062cd26 144487: 87977334ce93335c052635e7575f728cd2b70672 144479: 0d76fdfc8a072dfc5dddad3b47979dd06ac4f801 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/mcbsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ef032857321f..a7432d1e3837 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e53dd7180a1fd59a785dbfb9c633f01c96c388f +refs/heads/master: d53eb73795c55101453ea6ca4f486ea2ff7b0496 diff --git a/trunk/arch/arm/mach-omap1/mcbsp.c b/trunk/arch/arm/mach-omap1/mcbsp.c index d040c3f1027f..a2d7814896be 100644 --- a/trunk/arch/arm/mach-omap1/mcbsp.c +++ b/trunk/arch/arm/mach-omap1/mcbsp.c @@ -40,8 +40,8 @@ static void omap1_mcbsp_request(unsigned int id) */ if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { if (dsp_use++ == 0) { - api_clk = clk_get(NULL, "api_clk"); - dsp_clk = clk_get(NULL, "dsp_clk"); + api_clk = clk_get(NULL, "api_ck"); + dsp_clk = clk_get(NULL, "dsp_ck"); if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) { clk_enable(api_clk); clk_enable(dsp_clk);