diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
| commit | 6439e5c2a784f6b00dd136df54d6f0859bc77af3 (patch) | |
| tree | f9dee1f0bdcf07eb7ce86dfbf9f1a558bae62404 /sound/soc/Makefile | |
| parent | 7c9c29eefa8ba503a34bac4ca4fb27083b78b726 (diff) | |
| parent | 6f0c42269f000b1e346c84d9a589f17aa94c96d8 (diff) | |
| download | linux-6439e5c2a784f6b00dd136df54d6f0859bc77af3.tar.gz linux-6439e5c2a784f6b00dd136df54d6f0859bc77af3.tar.bz2 linux-6439e5c2a784f6b00dd136df54d6f0859bc77af3.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index af0a5714e107..8eb06db32fa0 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,6 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o -snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o ifneq ($(CONFIG_SND_SOC_TOPOLOGY),) snd-soc-core-objs += soc-topology.o |