]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:31:18 +0000 (17:31 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:31:18 +0000 (17:31 +0100)
sound/soc/omap/Kconfig

index d542ea2ff6bec2e1117003a580cee7f6fe9db2e4..a088db6d50911799780838c0388cf9435d2c3a31 100644 (file)
@@ -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.