From ef82fc160c127d250396e7be3cd4561b73129092 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 5 Jun 2012 10:44:23 +0100
Subject: [PATCH] --- yaml --- r: 316211 b: refs/heads/master c:
 165961efc03159631eadc086877704c7778ac356 h: refs/heads/master i:   316209:
 95357f5e3f938b8c48b17246c571fa22034bc746   316207:
 a0f2f3903eba4d1f697d22599b6b488278d0d7f0 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-dapm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 313a95ce0d5a..145ec590f9c3 100644
--- 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
index 39e8c2fdf50e..7365fed1ba74 100644
--- 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);