aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/Kconfig4
-rw-r--r--sound/soc/omap/Kconfig4
2 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cb5fcd605acc..656f180b2c1f 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -91,7 +91,6 @@ config SND_SOC_SSM2602
91 91
92config SND_SOC_TLV320AIC23 92config SND_SOC_TLV320AIC23
93 tristate 93 tristate
94 depends on I2C
95 94
96config SND_SOC_TLV320AIC26 95config SND_SOC_TLV320AIC26
97 tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE 96 tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
@@ -99,15 +98,12 @@ config SND_SOC_TLV320AIC26
99 98
100config SND_SOC_TLV320AIC3X 99config SND_SOC_TLV320AIC3X
101 tristate 100 tristate
102 depends on I2C
103 101
104config SND_SOC_TWL4030 102config SND_SOC_TWL4030
105 tristate 103 tristate
106 depends on TWL4030_CORE
107 104
108config SND_SOC_UDA134X 105config SND_SOC_UDA134X
109 tristate 106 tristate
110 select SND_SOC_L3
111 107
112config SND_SOC_UDA1380 108config SND_SOC_UDA1380
113 tristate 109 tristate
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index ccd8973683db..675732e724d5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -8,7 +8,7 @@ config SND_OMAP_SOC_MCBSP
8 8
9config SND_OMAP_SOC_N810 9config SND_OMAP_SOC_N810
10 tristate "SoC Audio support for Nokia N810" 10 tristate "SoC Audio support for Nokia N810"
11 depends on SND_OMAP_SOC && MACH_NOKIA_N810 11 depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
12 select SND_OMAP_SOC_MCBSP 12 select SND_OMAP_SOC_MCBSP
13 select OMAP_MUX 13 select OMAP_MUX
14 select SND_SOC_TLV320AIC3X 14 select SND_SOC_TLV320AIC3X
@@ -17,7 +17,7 @@ config SND_OMAP_SOC_N810
17 17
18config SND_OMAP_SOC_OSK5912 18config SND_OMAP_SOC_OSK5912
19 tristate "SoC Audio support for omap osk5912" 19 tristate "SoC Audio support for omap osk5912"
20 depends on SND_OMAP_SOC && MACH_OMAP_OSK 20 depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C
21 select SND_OMAP_SOC_MCBSP 21 select SND_OMAP_SOC_MCBSP
22 select SND_SOC_TLV320AIC23 22 select SND_SOC_TLV320AIC23
23 help 23 help