summaryrefslogtreecommitdiffstats
path: root/fs/partitions
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-20 19:17:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-21 10:18:02 +0100
commit13f808cf8ddb5f3ca0f0271473c6c02a4b32580b (patch)
treebfd903966c876c32ffc3907dcc2ff67633d4b7df /fs/partitions
parent082100dc9210449dac8ad8c7d20180cc1a0c319d (diff)
downloadtalos-op-linux-13f808cf8ddb5f3ca0f0271473c6c02a4b32580b.tar.gz
talos-op-linux-13f808cf8ddb5f3ca0f0271473c6c02a4b32580b.zip
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 'fs/partitions')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud