git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/sta529', 'asoc/topic/sti', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
Makefile
diff --git
a/sound/soc/Makefile
b/sound/soc/Makefile
index 2f6aabb8b4c3437456e3c35f060d50d26c153050..39c27a58158db38c3f4db2a72af842747f7ef830 100644
(file)
--- a/
sound/soc/Makefile
+++ b/
sound/soc/Makefile
@@
-44,6
+44,7
@@
obj-$(CONFIG_SND_SOC) += sh/
obj-$(CONFIG_SND_SOC) += sirf/
obj-$(CONFIG_SND_SOC) += spear/
obj-$(CONFIG_SND_SOC) += sti/
+obj-$(CONFIG_SND_SOC) += stm/
obj-$(CONFIG_SND_SOC) += sunxi/
obj-$(CONFIG_SND_SOC) += tegra/
obj-$(CONFIG_SND_SOC) += txx9/