diff options
| author | Mark Brown <broonie@kernel.org> | 2017-11-10 21:30:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-10 21:30:53 +0000 |
| commit | c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b (patch) | |
| tree | d940401ba6bee67ad8e03b6d099e3e797c40600a /sound/soc/intel/common/Makefile | |
| parent | bd26974f7148d14d432f5c5eb0316e80792b4356 (diff) | |
| parent | 1c0a7de226660b0306b54aaf2cb52312e74723eb (diff) | |
| download | linux-c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b.tar.gz linux-c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b.tar.bz2 linux-c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b.zip | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/common/Makefile')
| -rw-r--r-- | sound/soc/intel/common/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index 0e029f354f6b..7379d8830c39 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,11 +1,11 @@ # 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 -obj-$(CONFIG_SND_SOC_INTEL_SST_MATCH) += snd-soc-sst-match.o obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o +obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o |