diff options
author | Mark Brown <broonie@kernel.org> | 2017-08-17 18:15:39 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-17 18:15:39 +0100 |
commit | a46f1cfaab29639289c82288ef84070f1acf8100 (patch) | |
tree | bc777334f1da0fd4230d1d26c95280e0fc5e8d13 /sound/soc/codecs/Kconfig | |
parent | 23c7159a799f3364720b3d250f57bc8e26b17287 (diff) | |
parent | 6e37f933ed1ade3201dd609d103c0ef79c0ef6b0 (diff) | |
download | linux-a46f1cfaab29639289c82288ef84070f1acf8100.tar.bz2 |
Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dmic
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 952c44dd5e90..aee9ef16dae6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -114,6 +114,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_PCM5102A select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER + select SND_SOC_RT274 if I2C select SND_SOC_RT286 if I2C select SND_SOC_RT298 if I2C select SND_SOC_RT5514 if I2C @@ -716,11 +717,17 @@ config SND_SOC_RL6231 config SND_SOC_RL6347A tristate + default y if SND_SOC_RT274=y default y if SND_SOC_RT286=y default y if SND_SOC_RT298=y + default m if SND_SOC_RT274=m default m if SND_SOC_RT286=m default m if SND_SOC_RT298=m +config SND_SOC_RT274 + tristate + depends on I2C + config SND_SOC_RT286 tristate depends on I2C |