summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-08-27 14:49:59 +0200
committerTakashi Iwai <tiwai@suse.de>2013-08-27 14:49:59 +0200
commit1c9a341bbdc14051a4d8c74ea67269786c7d3736 (patch)
treec96f4360bf8243bca7ec431e7ae3a33cfd8154fa /sound/pci
parent2e59e5ab1c24489c5581b83e56b0435432c54dfe (diff)
downloadlinux-1c9a341bbdc14051a4d8c74ea67269786c7d3736.tar.bz2
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 <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-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"