diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-06 22:51:54 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-06 22:51:54 +0900 |
| commit | 378d590c494551a68a824b939c711bb9a280e9ef (patch) | |
| tree | 7481e5902a89c9814666bdc45a3ff9f43f1c4450 /sound/soc/intel/Kconfig | |
| parent | 7f5a466f2ea1115a4a73d987b7b6a73d23475305 (diff) | |
| parent | 1587a061ef562de0d97c82a95863e191bcd69d63 (diff) | |
Merge branch 'asoc-5.2' into asoc-next
Diffstat (limited to 'sound/soc/intel/Kconfig')
| -rw-r--r-- | sound/soc/intel/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index bd9fd2035c55..fc1396adde71 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -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" |