summaryrefslogtreecommitdiffstats
path: root/sound/soc/amd
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2021-12-15 10:35:11 -0600
committerMark Brown <broonie@kernel.org>2021-12-15 22:16:51 +0000
commitfb6c83cab376c0963341a9521e85c1795acaec9b (patch)
treeb757ddfe92aa7c4cfe26139cced5cde861b215e5 /sound/soc/amd
parent88dffe43cbc625eb52a57daa0d1c0fb7037b63d2 (diff)
downloadlinux-stable-fb6c83cab376c0963341a9521e85c1795acaec9b.tar.gz
linux-stable-fb6c83cab376c0963341a9521e85c1795acaec9b.tar.bz2
linux-stable-fb6c83cab376c0963341a9521e85c1795acaec9b.zip
ASoC: AMD: fix depend/select mistake on SND_AMD_ACP_CONFIG
on i386 or x86_64: when # CONFIG_ACPI is not set, so SND_SOC_ACPI is not set: WARNING: unmet direct dependencies detected for SND_AMD_ACP_CONFIG Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_ACPI [=n] Selected by [y]: - SND_SOC_AMD_ACP_COMMON [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && X86 [=y] && PCI [=y] This problem is due to the unconditional selection of SND_AMD_ACP_CONFIG in other options. Using 'depends on' solved an initial problem but exposed another, let's use select instead. Reported-by: Randy Dunlap <rdunlap@infradead.org> Fixes: d9b994cd7641 ('ASoC: AMD: acp-config: fix missing dependency on SND_SOC_ACPI') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@intel.com> Reviewed-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com> Link: https://lore.kernel.org/r/20211215163511.151286-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/amd')
-rw-r--r--sound/soc/amd/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index bcfeb3fc2592..7a9e45094f37 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -98,7 +98,7 @@ config SND_SOC_AMD_YC_MACH
config SND_AMD_ACP_CONFIG
tristate "AMD ACP configuration selection"
- depends on SND_SOC_ACPI
+ select SND_SOC_ACPI if ACPI
help
This option adds an auto detection to determine which ACP
driver modules to use