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

sound/soc/codecs/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -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