diff --git a/[refs] b/[refs]
index 2bfa17cdc2da..c10dbfc654c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76d8ceaaff9d7fc1ba2b1963a9f34151832223b
+refs/heads/master: 0d94e41abe271c86df06bcf72d24f9ca7ce771f0
diff --git a/trunk/sound/core/Kconfig b/trunk/sound/core/Kconfig
index 335d45ecde6a..9c4da1cd4a6b 100644
--- a/trunk/sound/core/Kconfig
+++ b/trunk/sound/core/Kconfig
@@ -12,6 +12,12 @@ config SND_HWDEP
 config SND_RAWMIDI
 	tristate
 
+# To be effective this also requires INPUT - users should say:
+#    select SND_JACK if INPUT=y || INPUT=SND
+# to avoid having to force INPUT on.
+config SND_JACK
+	bool
+
 config SND_SEQUENCER
 	tristate "Sequencer support"
 	select SND_TIMER
diff --git a/trunk/sound/core/Makefile b/trunk/sound/core/Makefile
index da8e685eef9c..d57125a5687d 100644
--- a/trunk/sound/core/Makefile
+++ b/trunk/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_JACK)	  += jack.o
 
 snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
 		pcm_memory.o