summaryrefslogtreecommitdiff
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-03-31 14:16:31 +0400
committerTakashi Iwai <tiwai@suse.de>2014-03-31 14:16:31 +0400
commit9ddd84f872898373c51469f9c931d5aa89fdc807 (patch)
treed81f9e396801f04d55924c0d3bbd903fe60ebcda /sound/soc/Makefile
parent749d32237bf39e6576dd95bfdf24e4378e51716c (diff)
parenta4b7f21d7b42b33609df3f86992a8deff80abfaf (diff)
downloadlinux-9ddd84f872898373c51469f9c931d5aa89fdc807.tar.xz
Merge branch 'for-next' into for-linus
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 62a1822e77bf..5f1df02984f8 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += samsung/
obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/
+obj-$(CONFIG_SND_SOC) += sirf/
obj-$(CONFIG_SND_SOC) += spear/
obj-$(CONFIG_SND_SOC) += tegra/
obj-$(CONFIG_SND_SOC) += txx9/