summaryrefslogtreecommitdiffstats
path: root/sound/core/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-22 16:04:45 +0200
committerTakashi Iwai <tiwai@suse.de>2015-05-22 16:04:45 +0200
commit181a152a09ccbf977ea69405cde4d87b5585de6c (patch)
tree7da9527a962994fb2c1202c7e63954c1f0e950f3 /sound/core/Makefile
parent6ab97f25ad1c3883f0dc20d2d5b7dae30acade74 (diff)
parent9203dd016a5d8ffb2eb6acdca60cd0b5dfe38c2b (diff)
downloadlinux-181a152a09ccbf977ea69405cde4d87b5585de6c.tar.bz2
Merge branch 'topic/hdmi' into for-next
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r--sound/core/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 7dd17a365269..73871b63a092 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -16,6 +16,8 @@ snd-$(CONFIG_SND_JACK) += ctljack.o jack.o
snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
pcm_memory.o memalloc.o
snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
+snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o
+snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o
# for trace-points
CFLAGS_pcm_lib.o := -I$(src)