---

yaml --- r: 316211 b: refs/heads/master c: 165961e h: refs/heads/master i: 316209: 95357f5 316207: a0f2f39 v: v3
git-mirror · Jun 5, 2012 · ef82fc1 · ef82fc1
1 parent 31b0add
commit ef82fc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eba8ec37fe8cfed4cacff56f9025b756cc43faa
+refs/heads/master: 165961efc03159631eadc086877704c7778ac356
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/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);