浏览代码

Merge branch 'for-2.6.37' into for-2.6.38

Mark Brown 14 年之前
父节点
当前提交
28216bf48b
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      sound/soc/omap/Kconfig

+ 1 - 1
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.