diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 08:45:59 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 08:45:59 -0400 |
| commit | 83652a39d724c20f050560f314b771a0289fd571 (patch) | |
| tree | 18b9852b2f4189c527340aac1ee52cdfce38308e /sound | |
| parent | 0422e5e0be4cce09ed6a095410efa7ee0f978607 (diff) | |
| parent | 3fcdfc9dad07c2a6ea19dfb98a2151cd86d06c6a (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 75f571289154..4d82a58ff6b0 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -943,7 +943,8 @@ config SND_SOC_WM8955 | |||
| 943 | tristate | 943 | tristate |
| 944 | 944 | ||
| 945 | config SND_SOC_WM8960 | 945 | config SND_SOC_WM8960 |
| 946 | tristate | 946 | tristate "Wolfson Microelectronics WM8960 CODEC" |
| 947 | depends on I2C | ||
| 947 | 948 | ||
| 948 | config SND_SOC_WM8961 | 949 | config SND_SOC_WM8961 |
| 949 | tristate | 950 | tristate |