diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-08 15:11:18 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-08 16:51:38 (GMT) |
| commit | 995e54f5fe4606043e695cd3327b18fcfc88bc62 (patch) | |
| tree | 1c0e2f3b6fc7f7c33e350f49270f4ecc8aecfe27 /sound/soc/samsung | |
| parent | 47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4 (diff) | |
| download | linux-995e54f5fe4606043e695cd3327b18fcfc88bc62.tar.xz | |
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>
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/speyside.c | 1 |
1 files changed, 1 insertions, 0 deletions
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), |