ASoC: Fix mismerge of Speyside set_bias_level_post()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Jun 2011 15:11:18 +0000 (16:11 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Jun 2011 16:51:38 +0000 (17:51 +0100)
commit995e54f5fe4606043e695cd3327b18fcfc88bc62
tree1c0e2f3b6fc7f7c33e350f49270f4ecc8aecfe27
parent47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4
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>
sound/soc/samsung/speyside.c