aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-12-02 17:31:18 +0100
committerTakashi Iwai <tiwai@suse.de>2010-12-02 17:31:18 +0100
commitaf745bd724e304cc94a88a2fb43d53baffbd63a5 (patch)
tree29f036462376465a5415d2ec39e6c9f931e76cdd /sound
parent2062ea522bb58bb2aeee86d051b37136491ccd65 (diff)
parent0ffd22b694b739b3dc3f80bc93726b581e8e8af5 (diff)
downloadmrst-s0i3-test-af745bd724e304cc94a88a2fb43d53baffbd63a5.tar.gz
mrst-s0i3-test-af745bd724e304cc94a88a2fb43d53baffbd63a5.tar.xz
mrst-s0i3-test-af745bd724e304cc94a88a2fb43d53baffbd63a5.zip
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
Diffstat (limited to 'sound')
-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 d542ea2ff6b..a088db6d509 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM
config SND_OMAP_SOC_N810
tristate "SoC Audio support for Nokia N810"
depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
+ depends on OMAP_MUX
select SND_OMAP_SOC_MCBSP
- select OMAP_MUX
select SND_SOC_TLV320AIC3X
help
Say Y if you want to add support for SoC audio on Nokia N810.