diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-20 14:17:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-21 05:18:02 -0400 |
| commit | 13f808cf8ddb5f3ca0f0271473c6c02a4b32580b (patch) | |
| tree | bfd903966c876c32ffc3907dcc2ff67633d4b7df /sound/soc/soc-core.c | |
| parent | 082100dc9210449dac8ad8c7d20180cc1a0c319d (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>
Diffstat (limited to 'sound/soc/soc-core.c')
0 files changed, 0 insertions, 0 deletions