diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 22:05:07 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 22:05:07 -0500 |
| commit | 8db0d35bee8c7ea32591f33bf5aa97df454b3f6d (patch) | |
| tree | 202ff8185e6aa7fbb7993d1c9b417c04b7d3234b /sound/soc/fsl/Kconfig | |
| parent | d433570d9cac9c98de4c71b38d47b759f9168dea (diff) | |
| parent | cc1bc54aa787c39125fe843e81bd693e8f507c32 (diff) | |
Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl
Conflicts:
sound/soc/fsl/Kconfig
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index c26ff3441f43..269cb7e8164c 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -171,7 +171,7 @@ config SND_SOC_EUKREA_TLV320 | |||
| 171 | || MACH_EUKREA_MBIMXSD51_BASEBOARD \ | 171 | || MACH_EUKREA_MBIMXSD51_BASEBOARD \ |
| 172 | || (OF && ARM) | 172 | || (OF && ARM) |
| 173 | depends on I2C | 173 | depends on I2C |
| 174 | select SND_SOC_TLV320AIC23 | 174 | select SND_SOC_TLV320AIC23_I2C |
| 175 | select SND_SOC_IMX_AUDMUX | 175 | select SND_SOC_IMX_AUDMUX |
| 176 | select SND_SOC_IMX_SSI | 176 | select SND_SOC_IMX_SSI |
| 177 | select SND_SOC_FSL_SSI | 177 | select SND_SOC_FSL_SSI |