ALSA: jack: fix a randconfig build issue
diff mbox

Message ID 1430551687-16359-1-git-send-email-yang.jie@intel.com
State New
Headers show

Commit Message

Jie Yang May 2, 2015, 7:28 a.m. UTC
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>
---
 sound/pci/hda/Kconfig     | 10 +---------
 sound/pci/hda/hda_codec.h |  2 --
 2 files changed, 1 insertion(+), 11 deletions(-)

Comments

Takashi Iwai May 2, 2015, 8:03 a.m. UTC | #1
At Sat,  2 May 2015 15:28:07 +0800,
Jie Yang wrote:
> 
> 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>

Applied, thanks.


Takashi

> ---
>  sound/pci/hda/Kconfig     | 10 +---------
>  sound/pci/hda/hda_codec.h |  2 --
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> index 5c296d3..117bf5c 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
> diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
> index 0f8b6b5..ed7e9cf 100644
> --- a/sound/pci/hda/hda_codec.h
> +++ b/sound/pci/hda/hda_codec.h
> @@ -274,10 +274,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 */
>  
> -- 
> 1.9.1
>

Patch
diff mbox

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 5c296d3..117bf5c 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
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 0f8b6b5..ed7e9cf 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -274,10 +274,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 */