Merge branch 'topic/jack' into for-next

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 5c296d30729c0f51137d00369c032efda2e6d96f..117bf5cf9f1d9e40be07a3b7d48c49676d5c1c04 100644 (file)
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -4,7 +4,7 @@ config SND_HDA
        tristate
        select SND_PCM
        select SND_VMASTER
-       select SND_JACK
+       select SND_JACK if INPUT=y || INPUT=SND
        select SND_HDA_CORE
 
 config SND_HDA_INTEL
@@ -84,14 +84,6 @@ config SND_HDA_INPUT_BEEP_MODE
          Set 1 to always enable the digital beep interface for HD-audio by
          default.
 
-config SND_HDA_INPUT_JACK
-       bool "Support jack plugging notification via input layer"
-       depends on INPUT=y || INPUT=SND
-       select SND_JACK
-       help
-         Say Y here to enable the jack plugging notification via
-         input layer.
-
 config SND_HDA_PATCH_LOADER
        bool "Support initialization patch loading for HD-audio"
        select FW_LOADER

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 0f8b6b5812e6856dc377d18550e982f3761ac803..ed7e9cfd699a6ee744990c12ca1ce6f420aa510c 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -274,10 +274,8 @@ struct hda_codec {
        unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */
        struct delayed_work jackpoll_work;
 
-#ifdef CONFIG_SND_HDA_INPUT_JACK
        /* jack detection */
        struct snd_array jacks;
-#endif
 
        int depop_delay; /* depop delay in ms, -1 for default delay time */