diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2016-01-04 17:20:23 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 12:43:54 +0000 |
| commit | dc901a3541717ca4963dd017eacf50a4c954609c (patch) | |
| tree | 97dccb849952e49e25437c4742427a809e175200 /sound/soc/intel | |
| parent | 0ec66e2d74aadaaee7e218861ca86effcd029435 (diff) | |
ASoC: Intel: fix ACPI probe regression with Atom DPCM driver
The commit 95f098014815b330838b1173d3d7bcea3b481242
"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>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/common/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index 3b9332e7a094..668fdeee195e 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,5 +1,10 @@ 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 +endif + snd-soc-sst-ipc-objs := sst-ipc.o snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o |