Unverified Commit 79ef7a4c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: Fix Kconfig for ACPI=n 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

A recent attempt to fix a missing symbol when
CONFIG_SND_SOC_SDCA=m and CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS=y
caused unmet direct dependency warning with randconig.

The reason is that SND_SOC_ACPI_INTEL_MATCH is needed to be compilable
even if ACPI is not selected, modules have dependency on exported
symbols from it.

The only solution for these kconfig dependencies seams to be to
only select SND_SOC_SDCA if ACPI is enabled  from
SND_SOC_ACPI_INTEL_SDCA_QUIRKS.

Regards,
Peter
---
Peter Ujfalusi (2):
  ASoC: Intel: Kconfig: Only select SND_SOC_SDCA if ACPI is enabled
  ASoC: Intel: Kconfig: Revert make SND_SOC_ACPI_INTEL_MATCH depend on
    ACPI

 sound/soc/intel/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--
2.47.0
parents ed7bca5b 4f1636e7

sound/soc/intel/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -70,15 +70,14 @@ if SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL 


config SND_SOC_ACPI_INTEL_MATCH

	tristate

	depends on ACPI

	select SND_SOC_ACPI

	select SND_SOC_ACPI if ACPI

	select SND_SOC_ACPI_INTEL_SDCA_QUIRKS

	# this option controls the compilation of ACPI matching tables and

	# helpers and is not meant to be selected by the user.



config SND_SOC_ACPI_INTEL_SDCA_QUIRKS

	tristate

	select SND_SOC_SDCA

	select SND_SOC_SDCA if ACPI



endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL