diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-31 20:54:03 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-31 20:54:03 +0200 |
commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /sound/soc/Makefile | |
parent | Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus (diff) | |
parent | Merge series "ASoC: core: Two step component registration" from Cezary Rojews... (diff) | |
download | linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.xz linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.zip |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r-- | sound/soc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 7f1747518e79..ddbac3a2169f 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o -snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o soc-link.o soc-card.o +snd-soc-core-objs += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o ifneq ($(CONFIG_SND_SOC_TOPOLOGY),) |