diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:20 +0000 |
| commit | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (patch) | |
| tree | e78afc627e64e2764e5539de683ccfd37217a0bd | |
| parent | 53f3bdb0903f10e331b338b5d8ce7e464cb0ca3d (diff) | |
| parent | 234bf1f0f03f879da2be698fb749f9a4b7322221 (diff) | |
| download | op-kernel-dev-8b3272bffe58682de568e36f9db52495f9b9d0f2.zip op-kernel-dev-8b3272bffe58682de568e36f9db52495f9b9d0f2.tar.gz | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
| -rw-r--r-- | sound/soc/intel/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 4577b69..3c81b38 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -32,7 +32,7 @@ config SND_SOC_INTEL_BAYTRAIL config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" - depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -43,7 +43,7 @@ config SND_SOC_INTEL_HASWELL_MACH config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C select SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5640 help |
