diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-11-15 17:11:16 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-11-15 17:11:16 +0100 |
commit | f38736c3c681985d9eddf2d8d19148df089cbd8e (patch) | |
tree | ddf3d0ae7c8bfbb509af0e7f9791f1229c971e2d /sound/soc | |
parent | 7087cb8fad5e19113d82f47f351fc6b338948d5f (diff) | |
parent | 20a52c059be2eb470db75076d55e1d932173fcc3 (diff) | |
download | linux-f38736c3c681985d9eddf2d8d19148df089cbd8e.tar.gz linux-f38736c3c681985d9eddf2d8d19148df089cbd8e.tar.bz2 linux-f38736c3c681985d9eddf2d8d19148df089cbd8e.zip |
Merge tag 'asoc-fix-v4.14-intel-kconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for Intel Kconfig
Fix the Intel Kconfig issue reported by Linus.
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/intel/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index bb8be10b8437..7b49d04e3c60 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -34,6 +34,11 @@ config SND_SOC_INTEL_SST_TOPLEVEL depends on X86 || COMPILE_TEST select SND_SOC_INTEL_MACH select SND_SOC_INTEL_COMMON + help + Intel ASoC Audio Drivers. If you have a Intel machine that + has audio controller with a DSP and I2S or DMIC port, then + enable this option by saying Y or M + If unsure select "N". config SND_SOC_INTEL_HASWELL tristate "Intel ASoC SST driver for Haswell/Broadwell" |