From b3708e0d15c5922b7d2a5fc80e030cf226618921 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 4 Jun 2012 08:16:20 +0100
Subject: [PATCH] --- yaml --- r: 316205 b: refs/heads/master c:
 ec02995adad5a7b428f46c1a87fae1bc93d6dfe3 h: refs/heads/master i:   316203:
 757294fadd8b2f22d1b57fafd00c2853f228cd8d v: v3

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

diff --git a/[refs] b/[refs]
index 1d67c861099e..d33c8e135a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 695594f1b79d3b88e99e28f06afaab32c4d65853
+refs/heads/master: ec02995adad5a7b428f46c1a87fae1bc93d6dfe3
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index a66379accec9..39e8c2fdf50e 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -1011,12 +1011,14 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w,
 	if (!w->clk)
 		return -EIO;
 
+#ifdef CONFIG_HAVE_CLK
 	if (SND_SOC_DAPM_EVENT_ON(event)) {
 		return clk_enable(w->clk);
 	} else {
 		clk_disable(w->clk);
 		return 0;
 	}
+#endif
 }
 EXPORT_SYMBOL_GPL(dapm_clock_event);
 
@@ -2902,6 +2904,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 		}
 		break;
 	case snd_soc_dapm_clock_supply:
+#ifdef CONFIG_HAVE_CLK
 		w->clk = devm_clk_get(dapm->dev, w->name);
 		if (IS_ERR(w->clk)) {
 			ret = PTR_ERR(w->clk);
@@ -2909,6 +2912,9 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 				w->name, ret);
 			return NULL;
 		}
+#else
+		return NULL;
+#endif
 		break;
 	default:
 		break;