summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-05-25 09:58:01 +0300
committerTakashi Iwai <tiwai@suse.de>2021-05-25 09:58:01 +0300
commitdad19afce9ad93dda1a10d08afea71b6dd30f19f (patch)
tree30e4532c8341fbf89680813d2ec2e888ef99bd85 /sound/soc/fsl
parent2b899f31f1a6db2db4608bac2ac04fe2c4ad89eb (diff)
parentaf2702549d68519ac78228e915d9b2c199056787 (diff)
downloadlinux-dad19afce9ad93dda1a10d08afea71b6dd30f19f.tar.xz
Merge tag 'asoc-fix-v5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.13 A collection of fixes that have come in since the merge window, mainly device specific things. The fixes to the generic cards from Morimoto-san are handling regressions that were introduced in the merge window on at least the Kontron sl28-var3-ads2.
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 0917d65d6921..556c284f49dd 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -119,6 +119,7 @@ config SND_SOC_FSL_RPMSG
tristate "NXP Audio Base On RPMSG support"
depends on COMMON_CLK
depends on RPMSG
+ depends on SND_IMX_SOC || SND_IMX_SOC = n
select SND_SOC_IMX_RPMSG if SND_IMX_SOC != n
help
Say Y if you want to add rpmsg audio support for the Freescale CPUs.