ASoC: Fix mismerge of Speyside set_bias_level_post()
Subsystems (3)
PATCH 1/1 ASoC: Fix mismerge of Speyside set_bias_level_post()
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/samsung/speyside.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
sound/soc/samsung/speyside.c +1 -0
@@ -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),
Signature · 1 line
1.7.5.3
Quoted 4 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/samsung/speyside.c | 1 +
Acked-by Liam Girdwood <[email protected]>