summaryrefslogtreecommitdiffstats
path: root/sound/soc/sof/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-06-17 14:45:49 +0200
committerMark Brown <broonie@kernel.org>2019-06-17 15:48:48 +0100
commit9de7eaddfa7f47fbb1cd9cdb9aab405599ef414e (patch)
tree3068992c6eb53093ca00c8f8014d611800ed954b /sound/soc/sof/Kconfig
parent5b8cc7d17f56257056ed65624dec28dcdf14e87e (diff)
downloadlinux-stable-9de7eaddfa7f47fbb1cd9cdb9aab405599ef414e.tar.gz
linux-stable-9de7eaddfa7f47fbb1cd9cdb9aab405599ef414e.tar.bz2
linux-stable-9de7eaddfa7f47fbb1cd9cdb9aab405599ef414e.zip
ASoC: SOF: disallow building without CONFIG_PCI again
Compile-testing without PCI just causes warnings: sound/soc/sof/sof-pci-dev.c:330:13: error: 'sof_pci_remove' defined but not used [-Werror=unused-function] static void sof_pci_remove(struct pci_dev *pci) ^~~~~~~~~~~~~~ sound/soc/sof/sof-pci-dev.c:230:12: error: 'sof_pci_probe' defined but not used [-Werror=unused-function] static int sof_pci_probe(struct pci_dev *pci, ^~~~~~~~~~~~~ I tried to fix this in a way that would still allow compile tests, but it got too ugly, so this just reverts the patch that allowed it in the first place. Most architectures do allow enabling PCI, so the value of the COMPILE_TEST alternative was not very high to start with. Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/Kconfig')
-rw-r--r--sound/soc/sof/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 1d4b4dced4b6..bc6d7b311af4 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -10,7 +10,7 @@ if SND_SOC_SOF_TOPLEVEL
config SND_SOC_SOF_PCI
tristate "SOF PCI enumeration support"
- depends on PCI || COMPILE_TEST
+ depends on PCI
select SND_SOC_SOF
select SND_SOC_ACPI if ACPI
select SND_SOC_SOF_OPTIONS