aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/Kconfig
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-05-02 15:28:07 +0800
committerTakashi Iwai <tiwai@suse.de>2015-05-02 10:02:17 +0200
commit973109cafc9d11e41be4d64667ff2165bf79d948 (patch)
tree5e40a66a13042564178880526dddda27a786faad /sound/pci/hda/Kconfig
parentALSA: jack: Fix another NULL dereference due to empty input jack (diff)
downloadlinux-dev-973109cafc9d11e41be4d64667ff2165bf79d948.tar.xz
linux-dev-973109cafc9d11e41be4d64667ff2165bf79d948.zip
ALSA: jack: fix a randconfig build issue
Building errors reported such as below when 'CONFIG_INPUT=m': ...undefined reference to `input_xxx'... Here change to enable SND_JACK selectively to fix the issue. Also remove the config 'SND_HDA_INPUT_JACK' which won't be used anymore. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 4d3d4747e55a..78e9e411977a 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
@@ -87,14 +87,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