From 995e54f5fe4606043e695cd3327b18fcfc88bc62 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 8 Jun 2011 16:11:18 +0100 Subject: ASoC: Fix mismerge of Speyside set_bias_level_post() Signed-off-by: Mark Brown Acked-by: Liam Girdwood --- sound/soc/samsung/speyside.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/samsung/speyside.c') diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 2515dba9f4aa..d6dee4d02036 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), -- cgit v1.2.3