diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-02 10:02:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-02 10:02:30 +0200 |
| commit | bd5b2d440745707ee97159ed7a06b629760fd19b (patch) | |
| tree | d085be86dc110b8c69c53d6ad4728d604b8ca793 /sound/pci | |
| parent | 3d716a0ad2e971cea46bb4393f9dfd7e76d883c6 (diff) | |
| parent | 973109cafc9d11e41be4d64667ff2165bf79d948 (diff) | |
| download | linux-stable-bd5b2d440745707ee97159ed7a06b629760fd19b.tar.gz linux-stable-bd5b2d440745707ee97159ed7a06b629760fd19b.tar.bz2 linux-stable-bd5b2d440745707ee97159ed7a06b629760fd19b.zip | |
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/Kconfig | 10 | ||||
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 2 |
2 files changed, 1 insertions, 11 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 diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 0f8b6b5812e6..ed7e9cfd699a 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 */ |