git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 082100d) | patch
ASoC: Fix merge issue with WM8962 control addition
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Sep 2010 18:17:44 +0000 (19:17 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 21 Sep 2010 09:18:02 +0000 (10:18 +0100)
commit13f808cf8ddb5f3ca0f0271473c6c02a4b32580b
treebfd903966c876c32ffc3907dcc2ff67633d4b7dftree | snapshot
parent082100dc9210449dac8ad8c7d20180cc1a0c319dcommit | diff
ASoC: Fix merge issue with WM8962 control addition

Let's not add the core controls twice.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/wm8962.c diff | blob | history
Pandora Kernel Repository