summaryrefslogtreecommitdiff
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-14 21:28:22 (GMT)
committerMark Brown <broonie@linaro.org>2014-01-14 21:28:22 (GMT)
commit67c2fe2f5d6c5448874479d0181909536b495d78 (patch)
tree0f2498f4e51749fbb4a95f5f49850c60e73ea68f /sound/soc/Makefile
parent2b67f8ba41ac7acf01c8d5c742c713ead8b589cd (diff)
parentbbe580302d33cff282129e26c44f9c3450d6a086 (diff)
downloadlinux-67c2fe2f5d6c5448874479d0181909536b495d78.tar.xz
Merge branch 'topic/axi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dma
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r--sound/soc/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 8b9e701..c70c7f7 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -8,6 +8,7 @@ endif
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/
obj-$(CONFIG_SND_SOC) += generic/
+obj-$(CONFIG_SND_SOC) += adi/
obj-$(CONFIG_SND_SOC) += atmel/
obj-$(CONFIG_SND_SOC) += au1x/
obj-$(CONFIG_SND_SOC) += blackfin/