diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /sound/soc/imx/Kconfig | |
| parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'sound/soc/imx/Kconfig')
| -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 | |||
| 28 | 28 | ||
| 29 | config SND_SOC_MX27VIS_AIC32X4 | 29 | config SND_SOC_MX27VIS_AIC32X4 |
| 30 | tristate "SoC audio support for Visstrim M10 boards" | 30 | tristate "SoC audio support for Visstrim M10 boards" |
| 31 | depends on MACH_IMX27_VISSTRIM_M10 | 31 | depends on MACH_IMX27_VISSTRIM_M10 && I2C |
| 32 | select SND_SOC_TLV320AIC32X4 | 32 | select SND_SOC_TLV320AIC32X4 |
| 33 | select SND_MXC_SOC_MX2 | 33 | select SND_MXC_SOC_MX2 |
| 34 | help | 34 | help |