summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-02-06 13:58:44 +0300
committerTakashi Iwai <tiwai@suse.de>2020-02-06 13:58:44 +0300
commit6954b323a183dc18fa9bf2ad700e0ed344918c5f (patch)
tree5b17c1e3e8cdccd620030542c0cc2a32ede2f5e7 /sound
parent6d011d5057ff88ee556c000ac6fe0be23bdfcd72 (diff)
parent13426feaf46c48fcddb591e89d35120fcc90527f (diff)
downloadlinux-6954b323a183dc18fa9bf2ad700e0ed344918c5f.tar.xz
Merge tag 'asoc-v5.6-3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for v5.6 An incremental fix for the Qualcomm COMMON_CLK issue.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 286514865960..7e90f5d83097 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -214,7 +214,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_UDA134X
select SND_SOC_UDA1380 if I2C
select SND_SOC_WCD9335 if SLIMBUS
- select SND_SOC_WCD934X if MFD_WCD934X
+ select SND_SOC_WCD934X if MFD_WCD934X && COMMON_CLK
select SND_SOC_WL1273 if MFD_WL1273_CORE
select SND_SOC_WM0010 if SPI_MASTER
select SND_SOC_WM1250_EV1 if I2C