Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/pci/hda/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -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

sound/pci/hda/hda_codec.h

+0 −2
Original line number Diff line number Diff line
@@ -300,10 +300,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 */