aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/imx/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 09:56:40 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 09:56:40 -0400
commitec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch)
treec7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /sound/soc/imx/Kconfig
parent6bfb6aa91f61f2a7c526a6353c8c50676ca528da (diff)
parenta532f97c71c7a952531e02b0994104c532fbef0f (diff)
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37
Trivial overlap with the removal of the local revision variable. Conflicts: sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/imx/Kconfig')
-rw-r--r--sound/soc/imx/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 66ba26393c10..642270a635ea 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -42,7 +42,9 @@ config SND_SOC_PHYCORE_AC97
42 42
43config SND_SOC_EUKREA_TLV320 43config SND_SOC_EUKREA_TLV320
44 tristate "Eukrea TLV320" 44 tristate "Eukrea TLV320"
45 depends on MACH_EUKREA_MBIMX27_BASEBOARD || MACH_EUKREA_MBIMXSD_BASEBOARD 45 depends on MACH_EUKREA_MBIMX27_BASEBOARD \
46 || MACH_EUKREA_MBIMXSD25_BASEBOARD \
47 || MACH_EUKREA_MBIMXSD35_BASEBOARD
46 select SND_SOC_TLV320AIC23 48 select SND_SOC_TLV320AIC23
47 select SND_MXC_SOC_SSI 49 select SND_MXC_SOC_SSI
48 select SND_MXC_SOC_FIQ 50 select SND_MXC_SOC_FIQ