Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core

Conflicts: sound/soc/soc-core.c
2026-09-28 19:20:30 +00:00 · 2014-04-14 17:42:28 +01:00 · 2014-04-14 17:42:28 +01:00 · aa0258adf6
commit aa0258adf6
parent 1a39019e93 b37f1d123c
53 changed files with 360 additions and 379 deletions
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c