summaryrefslogtreecommitdiff
path: root/sound/pci/hda/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-11 14:17:15 +0400
committerMark Brown <broonie@linaro.org>2013-09-11 14:17:15 +0400
commitc34c0d7684b8b79666da6b1bc37fc330cd0dd216 (patch)
treec2bc72d67862df770af45a88814759baa0744d2c /sound/pci/hda/Kconfig
parent29dc5dd229dc3130b51df0932e59946fc09d3bd4 (diff)
parent4345adf92db760ca1a54061ce284aaa2e7d0791e (diff)
downloadlinux-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.xz
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/pci/hda/Kconfig')
-rw-r--r--sound/pci/hda/Kconfig9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 59c5e9c03d53..8de66ccd7279 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -152,14 +152,9 @@ config SND_HDA_CODEC_HDMI
This module is automatically loaded at probing.
config SND_HDA_I915
- bool "Build Display HD-audio controller/codec power well support for i915 cards"
+ bool
+ default y
depends on DRM_I915
- help
- Say Y here to include full HDMI and DisplayPort HD-audio controller/codec
- power-well support for Intel Haswell graphics cards based on the i915 driver.
-
- Note that this option must be enabled for Intel Haswell C+ stepping machines, otherwise
- the GPU audio controller/codecs will not be initialized or damaged when exit from S3 mode.
config SND_HDA_CODEC_CIRRUS
bool "Build Cirrus Logic codec support"