summaryrefslogtreecommitdiff
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:30:53 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:30:53 +0000
commitc44ff31ae03c0970e1b3cfe1e37f347865a9dc8b (patch)
treed940401ba6bee67ad8e03b6d099e3e797c40600a /sound/soc/Makefile
parentbd26974f7148d14d432f5c5eb0316e80792b4356 (diff)
parent1c0a7de226660b0306b54aaf2cb52312e74723eb (diff)
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r--sound/soc/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index bf8c1e2ce0bf..5327f4d6c668 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -15,6 +15,12 @@ ifneq ($(CONFIG_SND_SOC_AC97_BUS),)
snd-soc-core-objs += soc-ac97.o
endif
+ifneq ($(CONFIG_SND_SOC_ACPI),)
+snd-soc-acpi-objs := soc-acpi.o
+endif
+
+obj-$(CONFIG_SND_SOC_ACPI) += snd-soc-acpi.o
+
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/
obj-$(CONFIG_SND_SOC) += generic/