Merge branch 'topic/jack' into for-next

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / Kconfig

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index a5ed1c181784276b507e59d3c8ce49735436ee81..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_KCTL_JACK
+       select SND_JACK if INPUT=y || INPUT=SND
        select SND_HDA_CORE
 
 config SND_HDA_INTEL
@@ -38,9 +38,6 @@ config SND_HDA_TEGRA
 
 if SND_HDA
 
-config SND_HDA_DSP_LOADER
-       bool
-
 config SND_HDA_PREALLOC_SIZE
        int "Pre-allocated buffer size for HD-audio driver"
        range 0 32768
@@ -87,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