diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 11:48:29 +0900 |
| commit | 42bef6866f0625108f695cae4719af6c34b99468 (patch) | |
| tree | 08021f818e728158c7b4c9ef433a68e09add607d /sound/soc/samsung/Makefile | |
| parent | 4c54c6de1aaad76092a1bc3194b351956d071b84 (diff) | |
| parent | 7ec41ee5ad5f716f67041c0d49014d0becb5332c (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/samsung/Makefile')
| -rw-r--r-- | sound/soc/samsung/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index 9eb3b12eb72..8509d3c4366 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -1,5 +1,6 @@ # S3c24XX Platform Support snd-soc-s3c24xx-objs := dma.o +snd-soc-idma-objs := idma.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-ac97-objs := ac97.o @@ -16,6 +17,7 @@ obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o obj-$(CONFIG_SND_SAMSUNG_PCM) += snd-soc-pcm.o obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o +obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-idma.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o |