Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next

2016-05-27 13:45:59 +01:00 · 2016-05-27 13:45:59 +01:00 · 83652a39d7
--- 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