From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 28 Apr 2015 06:31:31 +0000 (+0200)
Subject: Merge branch 'topic/jack' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1962fcab4ee80e555bcc9d0f50e416800d474fa2;p=linux-beck.git

Merge branch 'topic/jack' into for-next
---

1962fcab4ee80e555bcc9d0f50e416800d474fa2
diff --cc sound/core/Makefile
index ae1d32b084fd,e041dc25f2c8..7dd17a365269
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@@ -3,16 -3,11 +3,15 @@@
  # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
  #
  
 -snd-y     := sound.o init.o memory.o info.o control.o misc.o device.o
 +snd-y     := sound.o init.o memory.o control.o misc.o device.o
 +ifneq ($(CONFIG_PROC_FS),)
 +snd-y += info.o
 +snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
 +endif
  snd-$(CONFIG_ISA_DMA_API) += isadma.o
 -snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.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