Commit 973109ca authored by Jie Yang's avatar Jie Yang Committed by Takashi Iwai

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: default avatarJie Yang <yang.jie@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 43b2cd54
...@@ -4,7 +4,7 @@ config SND_HDA ...@@ -4,7 +4,7 @@ config SND_HDA
tristate tristate
select SND_PCM select SND_PCM
select SND_VMASTER select SND_VMASTER
select SND_JACK select SND_JACK if INPUT=y || INPUT=SND
select SND_HDA_CORE select SND_HDA_CORE
config SND_HDA_INTEL config SND_HDA_INTEL
...@@ -87,14 +87,6 @@ config SND_HDA_INPUT_BEEP_MODE ...@@ -87,14 +87,6 @@ config SND_HDA_INPUT_BEEP_MODE
Set 1 to always enable the digital beep interface for HD-audio by Set 1 to always enable the digital beep interface for HD-audio by
default. 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 config SND_HDA_PATCH_LOADER
bool "Support initialization patch loading for HD-audio" bool "Support initialization patch loading for HD-audio"
select FW_LOADER select FW_LOADER
......
...@@ -300,10 +300,8 @@ struct hda_codec { ...@@ -300,10 +300,8 @@ struct hda_codec {
unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */ unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */
struct delayed_work jackpoll_work; struct delayed_work jackpoll_work;
#ifdef CONFIG_SND_HDA_INPUT_JACK
/* jack detection */ /* jack detection */
struct snd_array jacks; struct snd_array jacks;
#endif
int depop_delay; /* depop delay in ms, -1 for default delay time */ int depop_delay; /* depop delay in ms, -1 for default delay time */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment