summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-17 12:12:00 +0200
committerMark Brown <broonie@kernel.org>2016-06-17 12:41:10 +0200
commitb82d67f4cf320b7ebe97799ffb0aa85e0172ab40 (patch)
treea42b88be4382cc33aff9d670472aadda2c880f43 /sound/soc
parentASoC: wm8985: add i2c dependency (diff)
downloadlinux-b82d67f4cf320b7ebe97799ffb0aa85e0172ab40.tar.xz
linux-b82d67f4cf320b7ebe97799ffb0aa85e0172ab40.zip
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 <arnd@arndb.de> Fixes: 05252513fbb9 ("ASoC: wm8985: add i2c dependency") Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/Kconfig2
1 files changed, 1 insertions, 1 deletions
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