Skip to content

Commit

Permalink
ASoC: Fix mismerge of Speyside set_bias_level_post()
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
  • Loading branch information
Mark Brown committed Jun 8, 2011
1 parent 47cb55a commit 995e54f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions sound/soc/samsung/speyside.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 995e54f

Please sign in to comment.