瀏覽代碼

ASoC: Fix spurious codec driver dependencies

Kbuild ignores dependency from things that are themselves selected so
ASoC machine drivers need to ensure that the control bus is being built.
This also avoids issues where multiple buses are supported by a given
codec.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Mark Brown 16 年之前
父節點
當前提交
ef963dcf68
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 0 4
      sound/soc/codecs/Kconfig
  2. 2 2
      sound/soc/omap/Kconfig

+ 0 - 4
sound/soc/codecs/Kconfig

@@ -91,7 +91,6 @@ config SND_SOC_SSM2602
 
 
 config SND_SOC_TLV320AIC23
 config SND_SOC_TLV320AIC23
 	tristate
 	tristate
-	depends on I2C
 
 
 config SND_SOC_TLV320AIC26
 config SND_SOC_TLV320AIC26
 	tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
 	tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
@@ -99,15 +98,12 @@ config SND_SOC_TLV320AIC26
 
 
 config SND_SOC_TLV320AIC3X
 config SND_SOC_TLV320AIC3X
 	tristate
 	tristate
-	depends on I2C
 
 
 config SND_SOC_TWL4030
 config SND_SOC_TWL4030
 	tristate
 	tristate
-	depends on TWL4030_CORE
 
 
 config SND_SOC_UDA134X
 config SND_SOC_UDA134X
        tristate
        tristate
-       select SND_SOC_L3
 
 
 config SND_SOC_UDA1380
 config SND_SOC_UDA1380
         tristate
         tristate

+ 2 - 2
sound/soc/omap/Kconfig

@@ -8,7 +8,7 @@ config SND_OMAP_SOC_MCBSP
 
 
 config SND_OMAP_SOC_N810
 config SND_OMAP_SOC_N810
 	tristate "SoC Audio support for Nokia N810"
 	tristate "SoC Audio support for Nokia N810"
-	depends on SND_OMAP_SOC && MACH_NOKIA_N810
+	depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
 	select SND_OMAP_SOC_MCBSP
 	select SND_OMAP_SOC_MCBSP
 	select OMAP_MUX
 	select OMAP_MUX
 	select SND_SOC_TLV320AIC3X
 	select SND_SOC_TLV320AIC3X
@@ -17,7 +17,7 @@ config SND_OMAP_SOC_N810
 
 
 config SND_OMAP_SOC_OSK5912
 config SND_OMAP_SOC_OSK5912
 	tristate "SoC Audio support for omap osk5912"
 	tristate "SoC Audio support for omap osk5912"
-	depends on SND_OMAP_SOC && MACH_OMAP_OSK
+	depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C
 	select SND_OMAP_SOC_MCBSP
 	select SND_OMAP_SOC_MCBSP
 	select SND_SOC_TLV320AIC23
 	select SND_SOC_TLV320AIC23
 	help
 	help