From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Nov 2017 21:30:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
X-Git-Tag: v4.15-rc1~118^2~1^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b;p=thirdparty%2Fkernel%2Flinux.git

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
---

c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b
diff --cc sound/soc/intel/Makefile
index 62f37ffffdf00,9105594436f0c..b973d457e834a
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@@ -1,6 -1,5 +1,6 @@@
 +# SPDX-License-Identifier: GPL-2.0
  # Core support
- obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
+ obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
  
  # Platform Support
  obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
diff --cc sound/soc/intel/common/Makefile
index 0e029f354f6bc,cb29653319d91..7379d8830c391
--- a/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@@ -1,9 -1,8 +1,9 @@@
 +# SPDX-License-Identifier: GPL-2.0
  snd-soc-sst-dsp-objs := sst-dsp.o
  snd-soc-sst-acpi-objs := sst-acpi.o
- snd-soc-sst-match-objs := sst-match-acpi.o
  snd-soc-sst-ipc-objs := sst-ipc.o
  snd-soc-sst-firmware-objs := sst-firmware.o
+ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o soc-acpi-intel-hsw-bdw-match.o
  
  obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
  obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o