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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
Makefile
diff --git
a/sound/soc/Makefile
b/sound/soc/Makefile
index 98e6f49dafc2a5a4167b6d17f2182925e4f79c46..4869c9ae7a03073766e3d8c6d3ac29579e5be5dd 100644
(file)
--- a/
sound/soc/Makefile
+++ b/
sound/soc/Makefile
@@
-1,4
+1,4
@@
snd-soc-core-objs := soc-core.o soc-dapm.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
-obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/
+obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/
s3c24xx/ sh/ fsl/