diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:44 +0000 |
commit | 941725f5fade7b35394f497c4d684d64a0e05965 (patch) | |
tree | f18b21c23255446f4ae8e5783b2637af9b6fb98f /sound/soc/Makefile | |
parent | 3ee3f454632547a8299c16156c3fefcc2a05726c (diff) | |
parent | c362effe5cda4df02aa7670d58636ea73979e304 (diff) | |
download | linux-941725f5fade7b35394f497c4d684d64a0e05965.tar.gz linux-941725f5fade7b35394f497c4d684d64a0e05965.tar.bz2 linux-941725f5fade7b35394f497c4d684d64a0e05965.zip |
Merge remote-tracking branch 'asoc/topic/core' 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 d88edfced8c4..2a043804a2bc 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,5 @@ 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 +snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o |