summaryrefslogtreecommitdiff
path: root/sound/pci/hda/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-02 11:02:30 +0300
committerTakashi Iwai <tiwai@suse.de>2015-05-02 11:02:30 +0300
commitbd5b2d440745707ee97159ed7a06b629760fd19b (patch)
treed085be86dc110b8c69c53d6ad4728d604b8ca793 /sound/pci/hda/Kconfig
parent3d716a0ad2e971cea46bb4393f9dfd7e76d883c6 (diff)
parent973109cafc9d11e41be4d64667ff2165bf79d948 (diff)
downloadlinux-bd5b2d440745707ee97159ed7a06b629760fd19b.tar.xz
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'sound/pci/hda/Kconfig')
-rw-r--r--sound/pci/hda/Kconfig10
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 5c296d30729c..117bf5cf9f1d 100644
--- 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