diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 18:16:35 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 18:16:35 +0400 |
| commit | 234bf1f0f03f879da2be698fb749f9a4b7322221 (patch) | |
| tree | 937f7946f6afb26a659d555a56116abed3ddd3e2 /sound/soc/Makefile | |
| parent | f410d5c953cf3c11629f138c5a2c3d3f40c61b5d (diff) | |
| parent | deeed33850c8a376addabbf971df433b2a1ba74c (diff) | |
| download | linux-234bf1f0f03f879da2be698fb749f9a4b7322221.tar.xz | |
Merge tag 'asoc-v3.15' into asoc-intel
ASoC: Updates for v3.15
Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:
- Lots of cleanups from Takashi for enumerations; the original API for
these was error prone so he's refactored lots of code to use more
modern APIs which avoid issues.
- Elimination of the ASoC level wrappers for I2C and SPI moving us
closer to converting to regmap completely and avoiding some
randconfig hassle.
- Provide both manually and transparently locked DAPM APIs rather than
a mix of the two fixing some concurrency issues.
- Start converting CODEC drivers to use separate bus interface drivers
rather than having them all in one file helping avoid dependency
issues.
- DPCM support for Intel Haswell and Bay Trail platforms.
- Lots of work on improvements for simple-card, DaVinci and the Renesas
rcar drivers.
- New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
CSR SiRF SoC.
Conflicts:
sound/soc/intel/Kconfig
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 62a1822e77bf..5f1df02984f8 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_SND_SOC) += pxa/ obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ +obj-$(CONFIG_SND_SOC) += sirf/ obj-$(CONFIG_SND_SOC) += spear/ obj-$(CONFIG_SND_SOC) += tegra/ obj-$(CONFIG_SND_SOC) += txx9/ |