diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:48 +0200 |
| commit | 11a93fd9402ce47e4dc652837b1374ecdb750aba (patch) | |
| tree | 87527afb0546cb914f46498bdf76af5cab8aa717 /sound/pci/hda/Kconfig | |
| parent | 366890df46c2fd9492c04fe3a8775447b7b053e4 (diff) | |
| parent | 8c8145b8734028f6deb487f7d64748da4c6c39ac (diff) | |
Merge branch 'topic/hda' into for-linus
* topic/hda:
ALSA: hda - Make jack-plug notification selectable
ALSA: hda - Add digital-mic support to ALC262 auto model
ALSA: hda - Fix check of input source type for realtek codecs
ALSA: hda - Add quirk for Sony VAIO Z21MN
ALSA: hda - Get back Input Source for ALC262 toshiba-s06 model
ALSA: hda - Fix unsigned comparison in patch_sigmatel.c
Diffstat (limited to 'sound/pci/hda/Kconfig')
| -rw-r--r-- | sound/pci/hda/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index c710150d506..04438f1d682 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -2,7 +2,6 @@ menuconfig SND_HDA_INTEL tristate "Intel HD Audio" select SND_PCM select SND_VMASTER - select SND_JACK if INPUT=y || INPUT=SND help Say Y here to include support for Intel "High Definition Audio" (Azalia) and its compatible devices. @@ -39,6 +38,14 @@ config SND_HDA_INPUT_BEEP Say Y here to build a digital beep interface for HD-audio driver. This interface is used to generate digital beeps. +config SND_HDA_INPUT_JACK + bool "Support jack plugging notification via input layer" + depends on INPUT=y || INPUT=SND_HDA_INTEL + select SND_JACK + help + Say Y here to enable the jack plugging notification via + input layer. + config SND_HDA_CODEC_REALTEK bool "Build Realtek HD-audio codec support" default y |