diff options
Diffstat (limited to 'sound/pci/hda/Kconfig')
-rw-r--r-- | sound/pci/hda/Kconfig | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index eb2a19b894a0..04438f1d682d 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig | |||
@@ -2,7 +2,6 @@ menuconfig SND_HDA_INTEL | |||
2 | tristate "Intel HD Audio" | 2 | tristate "Intel HD Audio" |
3 | select SND_PCM | 3 | select SND_PCM |
4 | select SND_VMASTER | 4 | select SND_VMASTER |
5 | select SND_JACK if INPUT=y || INPUT=SND | ||
6 | help | 5 | help |
7 | Say Y here to include support for Intel "High Definition | 6 | Say Y here to include support for Intel "High Definition |
8 | Audio" (Azalia) and its compatible devices. | 7 | Audio" (Azalia) and its compatible devices. |
@@ -39,6 +38,14 @@ config SND_HDA_INPUT_BEEP | |||
39 | Say Y here to build a digital beep interface for HD-audio | 38 | Say Y here to build a digital beep interface for HD-audio |
40 | driver. This interface is used to generate digital beeps. | 39 | driver. This interface is used to generate digital beeps. |
41 | 40 | ||
41 | config SND_HDA_INPUT_JACK | ||
42 | bool "Support jack plugging notification via input layer" | ||
43 | depends on INPUT=y || INPUT=SND_HDA_INTEL | ||
44 | select SND_JACK | ||
45 | help | ||
46 | Say Y here to enable the jack plugging notification via | ||
47 | input layer. | ||
48 | |||
42 | config SND_HDA_CODEC_REALTEK | 49 | config SND_HDA_CODEC_REALTEK |
43 | bool "Build Realtek HD-audio codec support" | 50 | bool "Build Realtek HD-audio codec support" |
44 | default y | 51 | default y |
@@ -139,6 +146,19 @@ config SND_HDA_CODEC_CONEXANT | |||
139 | snd-hda-codec-conexant. | 146 | snd-hda-codec-conexant. |
140 | This module is automatically loaded at probing. | 147 | This module is automatically loaded at probing. |
141 | 148 | ||
149 | config SND_HDA_CODEC_CA0110 | ||
150 | bool "Build Creative CA0110-IBG codec support" | ||
151 | depends on SND_HDA_INTEL | ||
152 | default y | ||
153 | help | ||
154 | Say Y here to include Creative CA0110-IBG codec support in | ||
155 | snd-hda-intel driver, found on some Creative X-Fi cards. | ||
156 | |||
157 | When the HD-audio driver is built as a module, the codec | ||
158 | support code is also built as another module, | ||
159 | snd-hda-codec-ca0110. | ||
160 | This module is automatically loaded at probing. | ||
161 | |||
142 | config SND_HDA_CODEC_CMEDIA | 162 | config SND_HDA_CODEC_CMEDIA |
143 | bool "Build C-Media HD-audio codec support" | 163 | bool "Build C-Media HD-audio codec support" |
144 | default y | 164 | default y |