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/Kconfig | |
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/Kconfig')
-rw-r--r-- | sound/soc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 7d5d6444a837..dcc79aa0236b 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
@@ -55,6 +55,7 @@ source "sound/soc/spear/Kconfig" | |||
55 | source "sound/soc/tegra/Kconfig" | 55 | source "sound/soc/tegra/Kconfig" |
56 | source "sound/soc/txx9/Kconfig" | 56 | source "sound/soc/txx9/Kconfig" |
57 | source "sound/soc/ux500/Kconfig" | 57 | source "sound/soc/ux500/Kconfig" |
58 | source "sound/soc/xtensa/Kconfig" | ||
58 | 59 | ||
59 | # Supported codecs | 60 | # Supported codecs |
60 | source "sound/soc/codecs/Kconfig" | 61 | source "sound/soc/codecs/Kconfig" |