Merge branch 'fortglx/3.12/time' into fortglx/3.13/time

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / Kconfig

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 59c5e9c03d538ea6c18fe377d5c0152c7b2030ba..8de66ccd7279d682d84f1718d8cd2f5788ac9e06 100644 (file)
--- 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"