diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
| commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
| tree | 7569661eae727a5a349e4c98dba42ca681857462 /sound/core/Makefile | |
| parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
| parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) | |
| download | op-kernel-dev-9e4ce164ee3a1d07580f017069c25d180b0aa785.zip op-kernel-dev-9e4ce164ee3a1d07580f017069c25d180b0aa785.tar.gz | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/core/Makefile')
| -rw-r--r-- | sound/core/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 67c8e93..43d4117 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -7,6 +7,7 @@ snd-y := sound.o init.o memory.o info.o control.o misc.o device.o snd-$(CONFIG_ISA_DMA_API) += isadma.o snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o snd-$(CONFIG_SND_VMASTER) += vmaster.o +snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o snd-$(CONFIG_SND_JACK) += jack.o snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ |
