diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
| commit | e83ce4a51757cf63970a76090662f636112231a7 (patch) | |
| tree | e1edaf29646eff64a3e94b2be77f7073ed8abb0d /sound/soc/intel/Kconfig | |
| parent | d6795827bd79b28fef1abdaf7e525fcca506b831 (diff) | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| download | linux-e83ce4a51757cf63970a76090662f636112231a7.tar.xz | |
Merge tag 'asoc-fix-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
A few fixes for v3.19, a few driver specifics and one core fix which
fixes a boot crash on OMAP if deferred probing kicks in due to
attempting to modify static data.
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 e989ecf046c9..f86de1211b96 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 |