diff options
| author | Takashi Iwai | 2015-05-22 16:04:45 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-05-22 16:04:45 +0200 |
| commit | 181a152a09ccbf977ea69405cde4d87b5585de6c (patch) | |
| tree | 7da9527a962994fb2c1202c7e63954c1f0e950f3 /sound/core/Makefile | |
| parent | ALSA: jack: Remove MODULE_*() macros (diff) | |
| parent | ALSA: pcm: add IEC958 channel status helper (diff) | |
| download | kernel-qcow2-linux-181a152a09ccbf977ea69405cde4d87b5585de6c.tar.gz kernel-qcow2-linux-181a152a09ccbf977ea69405cde4d87b5585de6c.tar.xz kernel-qcow2-linux-181a152a09ccbf977ea69405cde4d87b5585de6c.zip | |
Merge branch 'topic/hdmi' into for-next
Diffstat (limited to 'sound/core/Makefile')
| -rw-r--r-- | sound/core/Makefile | 2 |
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) |