summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-27 13:45:59 +0100
committerMark Brown <broonie@kernel.org>2016-05-27 13:45:59 +0100
commit83652a39d724c20f050560f314b771a0289fd571 (patch)
tree18b9852b2f4189c527340aac1ee52cdfce38308e /sound/soc
parent0422e5e0be4cce09ed6a095410efa7ee0f978607 (diff)
parent3fcdfc9dad07c2a6ea19dfb98a2151cd86d06c6a (diff)
downloadlinux-83652a39d724c20f050560f314b771a0289fd571.tar.gz
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 75f571289154..4d82a58ff6b0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -943,7 +943,8 @@ config SND_SOC_WM8955
tristate
config SND_SOC_WM8960
- tristate
+ tristate "Wolfson Microelectronics WM8960 CODEC"
+ depends on I2C
config SND_SOC_WM8961
tristate