diff options
| author | Mark Brown <broonie@kernel.org> | 2017-11-10 22:30:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-10 22:30:53 +0100 |
| commit | c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b (patch) | |
| tree | d940401ba6bee67ad8e03b6d099e3e797c40600a /sound/soc/Makefile | |
| parent | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (diff) | |
| parent | ASoC: hdac_hdmi: Fix possible memory leak on parse and map nid failure (diff) | |
| download | linux-c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b.tar.xz linux-c44ff31ae03c0970e1b3cfe1e37f347865a9dc8b.zip | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 6 |
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/ |