summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-12 20:26:38 +0400
committerTakashi Iwai <tiwai@suse.de>2011-08-12 20:26:38 +0400
commitc012cdc858db36ff2314469930bfcfb00eef6f29 (patch)
tree6038ccd1dec55f82642f6036a75af57cb6b2a921 /sound/soc/samsung/Makefile
parent15439bde3af7ff88459ea2b5520b77312e958df2 (diff)
parentf6b864a9071e21186476910613ec9913b56067a2 (diff)
downloadlinux-c012cdc858db36ff2314469930bfcfb00eef6f29.tar.xz
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/samsung/Makefile')
-rw-r--r--sound/soc/samsung/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 9eb3b12eb72f..8509d3c4366e 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