diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-30 17:52:16 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 17:52:16 +0300 |
| commit | 28becbd59c89cccf26b7539684105437fa77210e (patch) | |
| tree | 515a1df93817c4f164d38a75cac4aa6128079df6 /sound/soc/codecs/Kconfig | |
| parent | cb42e0f709a73caf4d631be32189bb1ca513ad25 (diff) | |
| parent | dbe71b9d86ee77cf58a92657c43b0e48954dc62b (diff) | |
| download | linux-28becbd59c89cccf26b7539684105437fa77210e.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ssm4567' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index efaafce8ba38..76125a281557 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -83,6 +83,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER select SND_SOC_RT286 if I2C + select SND_SOC_RT298 if I2C select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C select SND_SOC_RT5645 if I2C @@ -512,12 +513,18 @@ config SND_SOC_RL6231 config SND_SOC_RL6347A tristate default y if SND_SOC_RT286=y + default y if SND_SOC_RT298=y default m if SND_SOC_RT286=m + default m if SND_SOC_RT298=m config SND_SOC_RT286 tristate depends on I2C +config SND_SOC_RT298 + tristate + depends on I2C + config SND_SOC_RT5631 tristate "Realtek ALC5631/RT5631 CODEC" depends on I2C |