]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Intel: Kconfig: expose common option between SST and SOF drivers
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 12 Apr 2019 16:09:01 +0000 (11:09 -0500)
committerMark Brown <broonie@kernel.org>
Sat, 27 Apr 2019 17:51:41 +0000 (02:51 +0900)
Both drivers rely on the same module, expose it for both configurations

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/Kconfig

index bd9fd2035c554b9479500113816483b4d128b2c9..fc1396adde714088fcc4be0e9ee18421e5e3ab03 100644 (file)
@@ -196,13 +196,18 @@ config SND_SOC_INTEL_SKYLAKE_COMMON
 
 endif ## SND_SOC_INTEL_SKYLAKE_FAMILY
 
+endif ## SND_SOC_INTEL_SST_TOPLEVEL
+
+if SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
+
 config SND_SOC_ACPI_INTEL_MATCH
        tristate
        select SND_SOC_ACPI if ACPI
        # this option controls the compilation of ACPI matching tables and
        # helpers and is not meant to be selected by the user.
 
-endif ## SND_SOC_INTEL_SST_TOPLEVEL
+endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
+
 
 # ASoC codec drivers
 source "sound/soc/intel/boards/Kconfig"