From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 8 Jun 2011 15:11:18 +0000 (+0100)
Subject: ASoC: Fix mismerge of Speyside set_bias_level_post()
X-Git-Tag: v3.12-rc1~3017^2~1073
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=995e54f5fe4606043e695cd3327b18fcfc88bc62;p=kernel%2Fkernel-generic.git

ASoC: Fix mismerge of Speyside set_bias_level_post()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 2515dba..d6dee4d 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -301,6 +301,7 @@ static struct snd_soc_card speyside = {
 	.num_configs = ARRAY_SIZE(speyside_codec_conf),
 
 	.set_bias_level = speyside_set_bias_level,
+	.set_bias_level_post = speyside_set_bias_level_post,
 
 	.controls = controls,
 	.num_controls = ARRAY_SIZE(controls),