diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 21:53:01 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 21:53:01 (GMT) |
commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/mach-omap1 | |
parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
download | linux-fsl-qoriq-c2fda22207e2977d0b80eac58a9004b6f8beed6d.tar.xz |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/mcbsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index d9af981..ab7395d 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c @@ -38,7 +38,7 @@ static void omap1_mcbsp_request(unsigned int id) * On 1510, 1610 and 1710, McBSP1 and McBSP3 * are DSP public peripherals. */ - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { + if (id == 0 || id == 2) { if (dsp_use++ == 0) { api_clk = clk_get(NULL, "api_ck"); dsp_clk = clk_get(NULL, "dsp_ck"); @@ -59,7 +59,7 @@ static void omap1_mcbsp_request(unsigned int id) static void omap1_mcbsp_free(unsigned int id) { - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { + if (id == 0 || id == 2) { if (--dsp_use == 0) { if (!IS_ERR(api_clk)) { clk_disable(api_clk); |