Merge branch 'upstream' into upstream-jgarzik
[linux-2.6] / sound / soc / Makefile
1 snd-soc-core-objs := soc-core.o soc-dapm.o
2
3 obj-$(CONFIG_SND_SOC)   += snd-soc-core.o
4 obj-$(CONFIG_SND_SOC)   += codecs/ at91/ pxa/