diff options
| author | Mark Brown <broonie@kernel.org> | 2016-11-04 12:33:45 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-04 12:33:45 -0600 |
| commit | 56eba7a15bbd239b56e2586012501df7b9d201cc (patch) | |
| tree | 5083bcec6e0f0f04d675ee291e145dd3bbee31f2 /sound/soc/intel/Kconfig | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| parent | 7a5857c3c282c12a8bd0cfd2dd4a17a9252c2b4d (diff) | |
| download | lwn-56eba7a15bbd239b56e2586012501df7b9d201cc.tar.gz lwn-56eba7a15bbd239b56e2586012501df7b9d201cc.zip | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/intel/Kconfig')
| -rw-r--r-- | sound/soc/intel/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 26eb5a0a5575..fd5d1e091038 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -47,6 +47,7 @@ config SND_SOC_INTEL_SST_MATCH config SND_SOC_INTEL_HASWELL tristate + select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL tristate @@ -56,7 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -138,7 +138,6 @@ config SND_SOC_INTEL_BROADWELL_MACH I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help |