diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
| commit | 4eb99c5e5be396410fa62178e94b8fca62abf7d5 (patch) | |
| tree | 17670f1e0ffb20a1aaa48a72a7312c1ee4a036cb /sound | |
| parent | 73c089abb36b98866bbfbaec0f9a2dafbfe73ed5 (diff) | |
| parent | b92265a274f0fec27567e86b995424ef8823499f (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/system.c
drivers/media/video/mxc/capture/mxc_v4l2_capture.c
Diffstat (limited to 'sound')
| -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 f3788b5bc9fb..bff6b667a7b1 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -57,7 +57,7 @@ config SND_SOC_IMX_SGTL5000 config SND_SOC_IMX_CS42888 tristate "SoC Audio support for i.MX boards with cs42888" - depends on I2C && (MACH_MX6Q_ARM2 || MACH_MX53_ARD) + depends on I2C && (MACH_MX6Q_ARM2 || MACH_MX6Q_SABREAUTO || MACH_MX53_ARD) select SND_SOC_CS42888 select SND_MXC_SOC_MX2 help |