Merge branch 'topic/jack' into for-next

diff --cc sound/core/Makefile
index ae1d32b084fd79ef1a65a8433e785deba9793ca2,e041dc25f2c84b57ac068d830049c5eabd7f8fdd..7dd17a3652691b36b36c7454b7d8b319a0714bca
--- 1/sound/core/Makefile
--- 2/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

diff --cc sound/pci/hda/Kconfig
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge