From: Arnd Bergmann Date: Fri, 17 Jun 2016 10:12:00 +0000 (+0200) Subject: ASoC fix up SND_SOC_WM8985 dependency X-Git-Tag: v4.8-rc1~84^2~1^2^3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b82d67f4cf320b7ebe97799ffb0aa85e0172ab40;p=linux.git ASoC fix up SND_SOC_WM8985 dependency 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 Fixes: 05252513fbb9 ("ASoC: wm8985: add i2c dependency") Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f8f6dc6c6a98..cf6d401fc823 100644 --- 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