diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-06 23:44:24 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-06 23:44:24 +0200 |
commit | a8e992342ce4cd173d437d0aa4eecc9e30489f72 (patch) | |
tree | dbb45d586ed7370e32c006c506d6954d06779914 /sound/soc/mediatek | |
parent | ASoC: soc-core: remove legacy style dai_link (diff) | |
parent | SoC: rt274: Fix internal jack assignment in set_jack callback (diff) | |
download | linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.tar.xz linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.zip |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/mediatek')
-rw-r--r-- | sound/soc/mediatek/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index f70b7109f2b6..59980df5add6 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -132,7 +132,7 @@ config SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A config SND_SOC_MT8183_DA7219_MAX98357A tristate "ASoC Audio driver for MT8183 with DA7219 MAX98357A codec" - depends on SND_SOC_MT8183 + depends on SND_SOC_MT8183 && I2C select SND_SOC_MT6358 select SND_SOC_MAX98357A select SND_SOC_DA7219 |