projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0525251)
ASoC fix up SND_SOC_WM8985 dependency
authorArnd Bergmann <arnd@arndb.de>
Fri, 17 Jun 2016 10:12:00 +0000 (12:12 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 17 Jun 2016 10:41:10 +0000 (11:41 +0100)
I just added an I2C dependency to the wm8985 driver to work around
a build failure, but it turns out that was premature: we actually
need to depend on SND_SOC_I2C_AND_SPI, as the driver can work with either
of the two, and we only need to prevent a configuration that has
I2C=m and SND_SOC_WM8985=y.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 05252513fbb9 ("ASoC: wm8985: add i2c dependency")
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/Kconfig patch | blob | blame | history

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f8f6dc6c6a980e4b403bbb7a404832a78ae6767f..cf6d401fc823eca163434de6a2d8442583e2e9bf 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -945,7 +945,7 @@ config SND_SOC_WM8983
 
 config SND_SOC_WM8985
        tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
-       depends on I2C
+       depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_WM8988
        tristate