diff options
author | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
tree | 50312d13362dd49615148661ae7e6d91ac349719 /sound/soc/codecs | |
parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
download | lwn-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.gz lwn-4d90a4e677c5c45c787a774c84442e75c7ddd5be.zip |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 78be69e9b618..e6a0c5d05fa5 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1486,7 +1486,7 @@ config SND_SOC_WM8737 depends on SND_SOC_I2C_AND_SPI config SND_SOC_WM8741 - tristate "Wolfson Microelectronics WM8737 DAC" + tristate "Wolfson Microelectronics WM8741 DAC" depends on SND_SOC_I2C_AND_SPI config SND_SOC_WM8750 |