diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-09 16:47:05 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-09 16:47:05 +0300 |
commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
tree | 67c98488983a71305e24940930d6e27a96d54db2 /sound/soc/pxa/Kconfig | |
parent | 6c084839877666d987ff8bc4e0facd3c02d99d61 (diff) | |
parent | f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27 (diff) | |
download | linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.xz |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'sound/soc/pxa/Kconfig')
-rw-r--r-- | sound/soc/pxa/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 960744e46edc..776e148b0aa2 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -24,15 +24,19 @@ config SND_PXA2XX_AC97 config SND_PXA2XX_SOC_AC97 tristate select AC97_BUS + select SND_PXA2XX_LIB select SND_PXA2XX_LIB_AC97 select SND_SOC_AC97_BUS config SND_PXA2XX_SOC_I2S + select SND_PXA2XX_LIB tristate config SND_PXA_SOC_SSP - tristate + tristate "Soc Audio via PXA2xx/PXA3xx SSP ports" + depends on PLAT_PXA select PXA_SSP + select SND_PXA2XX_LIB config SND_MMP_SOC_SSPA tristate |