ASoC: Fix multi-component mismerge in WM8523
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 19:11:48 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 20:27:49 +0000 (20:27 +0000)
commitf71a4734b1ad7edccbfd9bd395df328ebbd94287
tree80f46fb70b96a599594da114a3dac85a4a234ccb
parentb3915d1fb6557dda206f4644ba9aa96ffd9a99d2
ASoC: Fix multi-component mismerge in WM8523

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/wm8523.c