| Message ID | 20211215163511.151286-1-pierre-louis.bossart@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | fb6c83cab376c0963341a9521e85c1795acaec9b |
| Headers | show |
| Series | ASoC: AMD: fix depend/select mistake on SND_AMD_ACP_CONFIG | expand |
On Wed, 15 Dec 2021 10:35:11 -0600, Pierre-Louis Bossart wrote: > 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] > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: AMD: fix depend/select mistake on SND_AMD_ACP_CONFIG commit: fb6c83cab376c0963341a9521e85c1795acaec9b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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
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> --- sound/soc/amd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)