summaryrefslogtreecommitdiff
path: root/sound/core/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-28 09:31:31 +0300
committerTakashi Iwai <tiwai@suse.de>2015-04-28 09:31:31 +0300
commit1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch)
tree945ba95f11016871f9d5241b7da2712f9367081a /sound/core/Makefile
parentf1a77547c21fe942e95ebaadbc9200f26d138574 (diff)
parent12e180a27f3e066a4ed4a446d428fd117f168beb (diff)
downloadlinux-1962fcab4ee80e555bcc9d0f50e416800d474fa2.tar.xz
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r--sound/core/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index ae1d32b084fd..7dd17a365269 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -11,8 +11,7 @@ endif
snd-$(CONFIG_ISA_DMA_API) += isadma.o
snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o
snd-$(CONFIG_SND_VMASTER) += vmaster.o
-snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o
-snd-$(CONFIG_SND_JACK) += jack.o
+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