Commit 995e54f5 authored by Mark Brown's avatar Mark Brown

ASoC: Fix mismerge of Speyside set_bias_level_post()

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 47cb55a9
...@@ -301,6 +301,7 @@ static struct snd_soc_card speyside = { ...@@ -301,6 +301,7 @@ static struct snd_soc_card speyside = {
.num_configs = ARRAY_SIZE(speyside_codec_conf), .num_configs = ARRAY_SIZE(speyside_codec_conf),
.set_bias_level = speyside_set_bias_level, .set_bias_level = speyside_set_bias_level,
.set_bias_level_post = speyside_set_bias_level_post,
.controls = controls, .controls = controls,
.num_controls = ARRAY_SIZE(controls), .num_controls = ARRAY_SIZE(controls),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment