From: Mark Brown <broonie@kernel.org>
Date: Mon, 2 May 2016 11:02:09 +0000 (+0100)
Subject: Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
X-Git-Tag: v4.7-rc1~116^2~3^2~7^2~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0ce8428ba9ea13098b828d0881e28368a108709c;p=linux.git

Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel

ASoC: Fixes for v4.6

This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development.  The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
---

0ce8428ba9ea13098b828d0881e28368a108709c
diff --cc sound/soc/intel/Kconfig
index 5a94f74d31dd,1120f4f4d011..399afa118822
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@@ -162,9 -162,7 +162,8 @@@ config SND_SOC_INTEL_CHT_BSW_MAX98090_T
  config SND_SOC_INTEL_SKYLAKE
  	tristate
  	select SND_HDA_EXT_CORE
 +	select SND_HDA_DSP_LOADER
  	select SND_SOC_TOPOLOGY
- 	select SND_HDA_I915
  	select SND_SOC_INTEL_SST
  
  config SND_SOC_INTEL_SKL_RT286_MACH