[alsa-devel] [PATCH] ASoC: Fix mismerge of Speyside set_bias_level_post()

Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- 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),