aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-07 06:34:36 -0500
committerTakashi Iwai <tiwai@suse.de>2013-02-07 06:34:36 -0500
commit45acc86b2e47e255c4a6194dd69248a1bce71e48 (patch)
tree1377b1f7df9bb1cb87f8416057770104bcb20b23 /sound/pci/hda/Kconfig
parent0186f4f4f248d00a2bfcd7c305cfec12fa8e5e30 (diff)
parent24f3cede590b2e072c64361867d220418a5df1a8 (diff)
Merge branch 'topic/hda-ca0132-dsp' into for-next
Diffstat (limited to 'sound/pci/hda/Kconfig')
-rw-r--r--sound/pci/hda/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 4466bf63d6bf..80a7d44bcf81 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -15,6 +15,9 @@ menuconfig SND_HDA_INTEL
15 15
16if SND_HDA_INTEL 16if SND_HDA_INTEL
17 17
18config SND_HDA_DSP_LOADER
19 bool
20
18config SND_HDA_PREALLOC_SIZE 21config SND_HDA_PREALLOC_SIZE
19 int "Pre-allocated buffer size for HD-audio driver" 22 int "Pre-allocated buffer size for HD-audio driver"
20 range 0 32768 23 range 0 32768
@@ -200,6 +203,17 @@ config SND_HDA_CODEC_CA0132
200 snd-hda-codec-ca0132. 203 snd-hda-codec-ca0132.
201 This module is automatically loaded at probing. 204 This module is automatically loaded at probing.
202 205
206config SND_HDA_CODEC_CA0132_DSP
207 bool "Support new DSP code for CA0132 codec"
208 depends on SND_HDA_CODEC_CA0132 && FW_LOADER
209 select SND_HDA_DSP_LOADER
210 help
211 Say Y here to enable the DSP for Creative CA0132 for extended
212 features like equalizer or echo cancellation.
213
214 Note that this option requires the external firmware file
215 (ctefx.bin).
216
203config SND_HDA_CODEC_CMEDIA 217config SND_HDA_CODEC_CMEDIA
204 bool "Build C-Media HD-audio codec support" 218 bool "Build C-Media HD-audio codec support"
205 default y 219 default y