Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
authorMark Brown <broonie@kernel.org>
Mon, 2 May 2016 11:02:09 +0000 (12:02 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 2 May 2016 11:02:09 +0000 (12:02 +0100)
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.

1  2 
sound/soc/intel/Kconfig
sound/soc/intel/skylake/skl-topology.c
sound/soc/intel/skylake/skl-topology.h

index 5a94f74d31dd0106af4860402b878ba8baa26541,1120f4f4d011cdc188dff6edd112d00ab027a769..399afa11882229e689d5d491e979fbd0516ce8ca
@@@ -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