Linux 5.10.217

[thirdparty/kernel/stable-queue.git] / queue-5.10 / asoc-fix-7-8-spaces-indentation-in-kconfig.patch

diff --git a/queue-5.10/asoc-fix-7-8-spaces-indentation-in-kconfig.patch b/queue-5.10/asoc-fix-7-8-spaces-indentation-in-kconfig.patch
deleted file mode 100644 (file)
index 39193cc..0000000
--- a/queue-5.10/asoc-fix-7-8-spaces-indentation-in-kconfig.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 3bdeb8eb5228f50e8e5be24e2be561bc62e92ff0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Nov 2020 18:49:04 +0100
-Subject: ASoC: Fix 7/8 spaces indentation in Kconfig
-
-From: Geert Uytterhoeven <geert@linux-m68k.org>
-
-[ Upstream commit 5268e0bf7123c422892fec362f5be2bcae9bbb95 ]
-
-Some entries used 7 or 8 spaces instead if a single TAB.
-
-Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-Link: https://lore.kernel.org/r/20201110174904.3413846-1-geert@linux-m68k.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Stable-dep-of: 6db26f9ea4ed ("ASoC: meson: cards: select SND_DYNAMIC_MINORS")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/codecs/Kconfig       | 18 +++++++++---------
- sound/soc/generic/Kconfig      |  2 +-
- sound/soc/intel/boards/Kconfig |  2 +-
- sound/soc/meson/Kconfig        |  2 +-
- sound/soc/pxa/Kconfig          | 14 +++++++-------
- 5 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 04a7070c78e28..a8b9eb6ce2ea8 100644
---- a/sound/soc/codecs/Kconfig
-+++ b/sound/soc/codecs/Kconfig
-@@ -517,7 +517,7 @@ config SND_SOC_AK5558
-       select REGMAP_I2C
- 
- config SND_SOC_ALC5623
--       tristate "Realtek ALC5623 CODEC"
-+      tristate "Realtek ALC5623 CODEC"
-       depends on I2C
- 
- config SND_SOC_ALC5632
-@@ -733,7 +733,7 @@ config SND_SOC_JZ4770_CODEC
-         will be called snd-soc-jz4770-codec.
- 
- config SND_SOC_L3
--       tristate
-+      tristate
- 
- config SND_SOC_DA7210
-       tristate
-@@ -773,10 +773,10 @@ config SND_SOC_HDMI_CODEC
-       select HDMI
- 
- config SND_SOC_ES7134
--       tristate "Everest Semi ES7134 CODEC"
-+      tristate "Everest Semi ES7134 CODEC"
- 
- config SND_SOC_ES7241
--       tristate "Everest Semi ES7241 CODEC"
-+      tristate "Everest Semi ES7241 CODEC"
- 
- config SND_SOC_ES8316
-       tristate "Everest Semi ES8316 CODEC"
-@@ -974,10 +974,10 @@ config SND_SOC_PCM186X_SPI
-       select REGMAP_SPI
- 
- config SND_SOC_PCM3008
--       tristate
-+      tristate
- 
- config SND_SOC_PCM3060
--       tristate
-+      tristate
- 
- config SND_SOC_PCM3060_I2C
-       tristate "Texas Instruments PCM3060 CODEC - I2C"
-@@ -1440,7 +1440,7 @@ config SND_SOC_UDA1334
-         rate) and mute.
- 
- config SND_SOC_UDA134X
--       tristate
-+      tristate
- 
- config SND_SOC_UDA1380
-       tristate
-@@ -1765,8 +1765,8 @@ config SND_SOC_MT6660
-         Select M to build this as module.
- 
- config SND_SOC_NAU8540
--       tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
--       depends on I2C
-+      tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
-+      depends on I2C
- 
- config SND_SOC_NAU8810
-       tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
-diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig
-index a90c3b28bce5f..4cafcf0e2bbfd 100644
---- a/sound/soc/generic/Kconfig
-+++ b/sound/soc/generic/Kconfig
-@@ -1,6 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config SND_SIMPLE_CARD_UTILS
--       tristate
-+      tristate
- 
- config SND_SIMPLE_CARD
-       tristate "ASoC Simple sound card support"
-diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
-index c10c37803c670..dddb672a6d553 100644
---- a/sound/soc/intel/boards/Kconfig
-+++ b/sound/soc/intel/boards/Kconfig
-@@ -552,7 +552,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
-       select SND_SOC_RT715_SDCA_SDW
-       select SND_SOC_RT5682_SDW
-       select SND_SOC_DMIC
--        help
-+      help
-         Add support for Intel SoundWire-based platforms connected to
-         MAX98373, RT700, RT711, RT1308 and RT715
-         If unsure select "N".
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index ce0cbdc69b2ec..b93ea33739f29 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -98,7 +98,7 @@ config SND_MESON_AXG_PDM
-         in the Amlogic AXG SoC family
- 
- config SND_MESON_CARD_UTILS
--       tristate
-+      tristate
- 
- config SND_MESON_CODEC_GLUE
-       tristate
-diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
-index 0ac85eada75cb..9d40e8a206d10 100644
---- a/sound/soc/pxa/Kconfig
-+++ b/sound/soc/pxa/Kconfig
-@@ -221,13 +221,13 @@ config SND_PXA2XX_SOC_MIOA701
-         MIO A701.
- 
- config SND_PXA2XX_SOC_IMOTE2
--       tristate "SoC Audio support for IMote 2"
--       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 && I2C
--       select SND_PXA2XX_SOC_I2S
--       select SND_SOC_WM8940
--       help
--       Say Y if you want to add support for SoC audio on the
--       IMote 2.
-+      tristate "SoC Audio support for IMote 2"
-+      depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 && I2C
-+      select SND_PXA2XX_SOC_I2S
-+      select SND_SOC_WM8940
-+      help
-+        Say Y if you want to add support for SoC audio on the
-+        IMote 2.
- 
- config SND_MMP_SOC_BROWNSTONE
-       tristate "SoC Audio support for Marvell Brownstone"
--- 
-2.43.0
-