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 branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
Makefile
diff --git
a/sound/soc/Makefile
b/sound/soc/Makefile
index 5327f4d6c668b6e6180849cd60e5d7de969089e1..74cd1858d38b4c28b53d21b4ba8e1aed9728f9a4 100644
(file)
--- a/
sound/soc/Makefile
+++ b/
sound/soc/Makefile
@@
-55,6
+55,7
@@
obj-$(CONFIG_SND_SOC) += stm/
obj-$(CONFIG_SND_SOC) += sunxi/
obj-$(CONFIG_SND_SOC) += tegra/
obj-$(CONFIG_SND_SOC) += txx9/
+obj-$(CONFIG_SND_SOC) += uniphier/
obj-$(CONFIG_SND_SOC) += ux500/
obj-$(CONFIG_SND_SOC) += xtensa/
obj-$(CONFIG_SND_SOC) += zte/