From: Takashi Iwai Date: Tue, 27 Aug 2013 12:49:59 +0000 (+0200) Subject: ALSA: hda - Simplify CONFIG_SND_HDA_I915 condition X-Git-Tag: accepted/tizen/common/20141203.182822~1038^2~171 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c9a341bbdc14051a4d8c74ea67269786c7d3736;p=platform%2Fkernel%2Flinux-arm64.git ALSA: hda - Simplify CONFIG_SND_HDA_I915 condition CONFIG_SND_HDA_I915 doesn't have to be user-selectable as this is almost mandatory when i915 driver is available. Let's enable it always when CONFIG_DRM_I915 is set, so that user won't be bothered by useless questions. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 59c5e9c..8de66cc 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"