projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5eba8ec
)
ASoC: dapm: The clock API is even less consistent than thought
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Tue, 5 Jun 2012 09:44:23 +0000
(10:44 +0100)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Tue, 5 Jun 2012 09:44:23 +0000
(10:44 +0100)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c
patch
|
blob
|
history
diff --git
a/sound/soc/soc-dapm.c
b/sound/soc/soc-dapm.c
index
39e8c2f
..
7365fed
100644
(file)
--- a/
sound/soc/soc-dapm.c
+++ b/
sound/soc/soc-dapm.c
@@
-2904,7
+2904,7
@@
snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
}
break;
case snd_soc_dapm_clock_supply:
-#ifdef CONFIG_
HAVE_CLK
+#ifdef CONFIG_
CLKDEV_LOOKUP
w->clk = devm_clk_get(dapm->dev, w->name);
if (IS_ERR(w->clk)) {
ret = PTR_ERR(w->clk);