diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-02-08 06:15:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-08 15:36:05 +0100 |
| commit | 902c136fe4f72dfc2a616ad755c72f1ee407f79a (patch) | |
| tree | 19f6e54b7fae267e3d06b9ee771f8cca1fa379a0 /sound | |
| parent | Linux 4.5-rc1 (diff) | |
| download | linux-902c136fe4f72dfc2a616ad755c72f1ee407f79a.tar.xz linux-902c136fe4f72dfc2a616ad755c72f1ee407f79a.zip | |
ASoC: Intel: Revert "ASoC: Intel: fix ACPI probe regression with Atom DPCM driver"
This reverts commit dc901a354171 ("ASoC: Intel: fix ACPI probe
regression with Atom DPCM driver") as the fix prevented the probe
on HSW/BDW if Atom-DPCM was selected
Acked-by: Jie Yang <yang.jie@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/common/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index 668fdeee195e..3b9332e7a094 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,10 +1,5 @@ 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 |