diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-05 20:18:39 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 20:18:39 (GMT) |
| commit | 8a5b69017e1923ce467c6e0c6231e0882f4afe56 (patch) | |
| tree | cbb60d38560b6880ecea9bfc3460ecd80220d8fb /sound/soc/intel/Kconfig | |
| parent | e948262ad01fc683d893abe10d1161231b2a6457 (diff) | |
| parent | 5c2b06369dafd796ebb4f17dab543d3da500245e (diff) | |
| download | linux-8a5b69017e1923ce467c6e0c6231e0882f4afe56.tar.xz | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Conflicts:
sound/soc/intel/sst/sst_acpi.c
Diffstat (limited to 'sound/soc/intel/Kconfig')
| -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 12093fd..ee03dbd 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -89,7 +89,7 @@ config SND_SOC_INTEL_BROADWELL_MACH config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio DSP Support for MID BYT Platform" - depends on X86 + depends on X86 && I2C select SND_SOC_RT5640 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI @@ -101,7 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH config SND_SOC_INTEL_CHT_BSW_RT5672_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS + depends on X86_INTEL_LPSS && I2C select SND_SOC_RT5670 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI |