diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
| commit | a3ae255e3729c1bb4507412ea29be804f703d44c (patch) | |
| tree | edd1ca577dad5a0d701ae111519eaefa60896f98 /sound/soc/Makefile | |
| parent | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (diff) | |
| parent | 16ca41c6cc904d7eb9e92afc5f576e375c314f90 (diff) | |
Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
More updates for v3.20:
- Lots of refactoring from Lars-Peter Clausen, moving drivers to more
data driven initialization and rationalizing a lot of DAPM usage.
- Much improved handling of CDCLK clocks on Samsung I2S controllers.
- Lots of driver specific cleanups and feature improvements.
- CODEC support for TI PCM514x and TLV320AIC3104 devices.
- Board support for Tegra systems with Realtek RT5677.
Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
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 865e090c8061..5b3c8f67c8db 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
| @@ -36,3 +36,4 @@ obj-$(CONFIG_SND_SOC) += spear/ | |||
| 36 | obj-$(CONFIG_SND_SOC) += tegra/ | 36 | obj-$(CONFIG_SND_SOC) += tegra/ |
| 37 | obj-$(CONFIG_SND_SOC) += txx9/ | 37 | obj-$(CONFIG_SND_SOC) += txx9/ |
| 38 | obj-$(CONFIG_SND_SOC) += ux500/ | 38 | obj-$(CONFIG_SND_SOC) += ux500/ |
| 39 | obj-$(CONFIG_SND_SOC) += xtensa/ | ||