aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-29 07:18:28 -0400
committerMark Brown <broonie@linaro.org>2014-05-01 13:59:40 -0400
commit654da9f5228f10d5390e429f786e251104ae12ae (patch)
tree234415fb59ff988205ac90eaef4d138b21b974a8
parent1aa91b6dd44a9517dee42913ecf9f51650b32cb6 (diff)
ASoC: samsung: UDA1380 needs I2C
The UDA1380 driver needs I2C to be enabled, so SND_SOC_SAMSUNG_H1940_UDA1380 and SND_SOC_SAMSUNG_RX1950_UDA1380 also require this. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/samsung/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index c5fd242e6dab..ef448b07a3bb 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -130,7 +130,7 @@ config SND_SOC_SAMSUNG_SIMTEC_HERMES
130 130
131config SND_SOC_SAMSUNG_H1940_UDA1380 131config SND_SOC_SAMSUNG_H1940_UDA1380
132 tristate "Audio support for the HP iPAQ H1940" 132 tristate "Audio support for the HP iPAQ H1940"
133 depends on SND_SOC_SAMSUNG && ARCH_H1940 133 depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C
134 select SND_S3C24XX_I2S 134 select SND_S3C24XX_I2S
135 select SND_SOC_UDA1380 135 select SND_SOC_UDA1380
136 help 136 help
@@ -138,7 +138,7 @@ config SND_SOC_SAMSUNG_H1940_UDA1380
138 138
139config SND_SOC_SAMSUNG_RX1950_UDA1380 139config SND_SOC_SAMSUNG_RX1950_UDA1380
140 tristate "Audio support for the HP iPAQ RX1950" 140 tristate "Audio support for the HP iPAQ RX1950"
141 depends on SND_SOC_SAMSUNG && MACH_RX1950 141 depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C
142 select SND_S3C24XX_I2S 142 select SND_S3C24XX_I2S
143 select SND_SOC_UDA1380 143 select SND_SOC_UDA1380
144 help 144 help