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

83652a39 · Mark Brown · 0422e5e0 · 3fcdfc9d · 83652a39
Commit 83652a39 authored May 27, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sound/soc/codecs/Kconfig sound/soc/codecs/Kconfig +2 -1

No files found.
--- 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