diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-02 11:02:09 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 11:02:09 (GMT) |
| commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
| tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /sound/soc/intel/Kconfig | |
| parent | fba0d7066524ab7b8ccf60e7e95981d10ed008b0 (diff) | |
| parent | 8c0f55100478649e3c0133684aa4aebab77ce10f (diff) | |
| download | linux-0ce8428ba9ea13098b828d0881e28368a108709c.tar.xz | |
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.
Diffstat (limited to 'sound/soc/intel/Kconfig')
| -rw-r--r-- | sound/soc/intel/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 5a94f74..399afa1 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -164,7 +164,6 @@ config SND_SOC_INTEL_SKYLAKE 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 |