summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-18 15:17:17 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-18 15:17:17 +0100
commitb3c4014c2b25856b9aeaf0792df330e417a8bd7b (patch)
treeeff94eaaf9bc218c4fea5cb939941461fe066123 /sound/soc/intel/Kconfig
parentASoC: intel: skl: Fix display power regression (diff)
parentASoC: amd: Fix potential NULL pointer dereference (diff)
downloadlinux-b3c4014c2b25856b9aeaf0792df330e417a8bd7b.tar.xz
linux-b3c4014c2b25856b9aeaf0792df330e417a8bd7b.zip
Merge tag 'asoc-fix-v5.0-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.0 Quite a big batch of fixes here. There's a couple of things going on, the main one is that we found some issues with not deferring probe when we should, causing us to skip some driver initialization. The fixes for this then in turn exposed some issues with how we were searching for components which had previously gone unnoticed due to the original issue. There's also been the normal driver specific stuff and there's been what looks like several batches of automated scanning for issues which have generated quite a large set of smaller fixes for potential crashes and missed error handling.
Diffstat (limited to 'sound/soc/intel/Kconfig')
-rw-r--r--sound/soc/intel/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 99a62ba409df..bd9fd2035c55 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -91,7 +91,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
default ACPI
- depends on X86 && ACPI
+ depends on X86 && ACPI && PCI
select SND_SST_IPC_ACPI
select SND_SST_ATOM_HIFI2_PLATFORM
select SND_SOC_ACPI_INTEL_MATCH