diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
| commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
| tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /sound/soc/codecs/Kconfig | |
| parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
| parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) | |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -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 7e90f5d83097..ea912439e446 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1406,7 +1406,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 |