diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:51:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:51:39 +0100 |
| commit | 7b62275507232f01f66d3e7d05c77bbd9009b726 (patch) | |
| tree | 172dd8a7632877df2b623462bc871ab42e093bcc /sound/soc/atmel/Kconfig | |
| parent | ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machines (diff) | |
| parent | ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad X395 (diff) | |
| download | linux-7b62275507232f01f66d3e7d05c77bbd9009b726.tar.xz linux-7b62275507232f01f66d3e7d05c77bbd9009b726.zip | |
Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A collection of mostly driver specific fixes, plus a maintainership
update for TI and a fix for DAPM driver removal paths.
Diffstat (limited to 'sound/soc/atmel/Kconfig')
| -rw-r--r-- | sound/soc/atmel/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 142373ec411a..9fe9471f4514 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -143,7 +143,7 @@ config SND_MCHP_SOC_SPDIFTX - sama7g5 This S/PDIF TX driver is compliant with IEC-60958 standard and - includes programable User Data and Channel Status fields. + includes programmable User Data and Channel Status fields. config SND_MCHP_SOC_SPDIFRX tristate "Microchip ASoC driver for boards using S/PDIF RX" @@ -157,5 +157,5 @@ config SND_MCHP_SOC_SPDIFRX - sama7g5 This S/PDIF RX driver is compliant with IEC-60958 standard and - includes programable User Data and Channel Status fields. + includes programmable User Data and Channel Status fields. endif |