Merge branch 'for-2.6.37' into for-2.6.38

28216bf4 · Mark Brown · 4514e899 · af745bd7 · 28216bf4
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

sound/soc/omap/Kconfig sound/soc/omap/Kconfig +1 -1

未找到文件。
--- 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.