diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
| commit | 3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef (patch) | |
| tree | 46d8032c9f224d28f258c44727a7165c9ba47c85 /sound/soc/davinci/Makefile | |
| parent | 4ec5c9693b46ab34976511cd43bf75c3a0fc704d (diff) | |
| parent | efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0 (diff) | |
Merge branch 'davinci' into for-2.6.32
Conflicts:
sound/soc/davinci/davinci-i2s.c
Diffstat (limited to 'sound/soc/davinci/Makefile')
| -rw-r--r-- | sound/soc/davinci/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile index ca8bae1fc3f6..67be54f3a3a5 100644 --- a/sound/soc/davinci/Makefile +++ b/sound/soc/davinci/Makefile @@ -1,13 +1,16 @@ # DAVINCI Platform Support snd-soc-davinci-objs := davinci-pcm.o snd-soc-davinci-i2s-objs := davinci-i2s.o +snd-soc-davinci-mcasp-objs:= davinci-mcasp.o obj-$(CONFIG_SND_DAVINCI_SOC) += snd-soc-davinci.o obj-$(CONFIG_SND_DAVINCI_SOC_I2S) += snd-soc-davinci-i2s.o +obj-$(CONFIG_SND_DAVINCI_SOC_MCASP) += snd-soc-davinci-mcasp.o # DAVINCI Machine Support snd-soc-evm-objs := davinci-evm.o snd-soc-sffsdr-objs := davinci-sffsdr.o obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o obj-$(CONFIG_SND_DAVINCI_SOC_SFFSDR) += snd-soc-sffsdr.o |