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

This commit is contained in:
Mark Brown 2016-05-27 13:45:59 +01:00
commit 83652a39d7

View File

@ -943,7 +943,8 @@ config SND_SOC_WM8955
tristate tristate
config SND_SOC_WM8960 config SND_SOC_WM8960
tristate tristate "Wolfson Microelectronics WM8960 CODEC"
depends on I2C
config SND_SOC_WM8961 config SND_SOC_WM8961
tristate tristate