summaryrefslogtreecommitdiff
path: root/sound/soc/omap/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-04-25 08:59:16 +0200
committerIngo Molnar <mingo@kernel.org>2012-04-25 08:59:16 +0200
commit3dbe927b1eddcbd66da1653168e33122aca84f4e (patch)
tree2357f4c55156597b1d07b9ea360b07086cd011e4 /sound/soc/omap/Kconfig
parenta385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff)
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/omap/Kconfig')
-rw-r--r--sound/soc/omap/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e00dd0b1139c..deafbfaacdbf 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -97,7 +97,7 @@ config SND_OMAP_SOC_SDP3430
config SND_OMAP_SOC_OMAP_ABE_TWL6040
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
- depends on TWL4030_CORE && SND_OMAP_SOC && ARCH_OMAP4
+ depends on TWL6040_CORE && SND_OMAP_SOC && ARCH_OMAP4
select SND_OMAP_SOC_DMIC
select SND_OMAP_SOC_MCPDM
select SND_SOC_TWL6040