diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-27 21:29:18 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-27 21:29:18 +0200 |
| commit | d6aa1db3eac37cc92d67c3f66eab1b46d5bb9f7b (patch) | |
| tree | 3dd03684f7436320ec64f9c702b5d057a25dca17 /sound/soc/codecs/Kconfig | |
| parent | ASoC: ics43432: Add codec driver for InvenSense ICS-43432 (diff) | |
| parent | ASoC: gtm601: Constify soc_codec_dev_gtm601 (diff) | |
| download | linux-d6aa1db3eac37cc92d67c3f66eab1b46d5bb9f7b.tar.xz linux-d6aa1db3eac37cc92d67c3f66eab1b46d5bb9f7b.zip | |
Merge branch 'topic/gtm601' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ics43432
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1bb6446dce53..c56cbe1ea649 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -62,6 +62,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_BT_SCO select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_ES8328_I2C if I2C + select SND_SOC_GTM601 select SND_SOC_ICS43432 select SND_SOC_ISABELLE if I2C select SND_SOC_JZ4740_CODEC @@ -447,6 +448,9 @@ config SND_SOC_ES8328_SPI tristate select SND_SOC_ES8328 +config SND_SOC_GTM601 + tristate 'GTM601 UMTS modem audio codec' + config SND_SOC_ICS43432 tristate |