diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 03:47:39 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 03:47:39 +0400 |
| commit | b71951d63d83194d449e8ec7b28c3f30176e8208 (patch) | |
| tree | 47b264ebcd35a947fef2dbd074bbe04760bc6474 /sound/soc/imx | |
| parent | dd85ecc269a3aa537fd045e113b4755a3cd1284f (diff) | |
| parent | 570a2429e964f8d63338b3450ba801a263b29b3a (diff) | |
| download | linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.xz | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/imx')
| -rw-r--r-- | sound/soc/imx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index b133bfcc5848..738391757f2c 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -28,7 +28,7 @@ config SND_MXC_SOC_WM1133_EV1 config SND_SOC_MX27VIS_AIC32X4 tristate "SoC audio support for Visstrim M10 boards" - depends on MACH_IMX27_VISSTRIM_M10 + depends on MACH_IMX27_VISSTRIM_M10 && I2C select SND_SOC_TLV320AIC32X4 select SND_MXC_SOC_MX2 help |