ASoC: Intel: fix ACPI probe regression with Atom DPCM driver
The commit 95f0980148
"ASoC: Intel: Move apci find machine routines"
introduced a regression in ACPI probe of the DPCM driver.
Fix by conditionally compiling sst-acpi when the DPCM driver
is not selected
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
0ec66e2d74
Коммит
dc901a3541
|
@ -1,5 +1,10 @@
|
||||||
snd-soc-sst-dsp-objs := sst-dsp.o
|
snd-soc-sst-dsp-objs := sst-dsp.o
|
||||||
|
ifneq ($(CONFIG_SND_SST_IPC_ACPI),)
|
||||||
|
snd-soc-sst-acpi-objs := sst-match-acpi.o
|
||||||
|
else
|
||||||
snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o
|
snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o
|
||||||
|
endif
|
||||||
|
|
||||||
snd-soc-sst-ipc-objs := sst-ipc.o
|
snd-soc-sst-ipc-objs := sst-ipc.o
|
||||||
|
|
||||||
snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o
|
snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o
|
||||||
|
|
Загрузка…
Ссылка в новой задаче