Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next

This commit is contained in:
Mark Brown
2016-07-24 22:07:48 +01:00
4 changed files with 149 additions and 38 deletions

View File

@@ -1002,7 +1002,8 @@ config SND_SOC_WM8983
tristate
config SND_SOC_WM8985
tristate
tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
depends on SND_SOC_I2C_AND_SPI
config SND_SOC_WM8988
tristate