diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /sound | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'sound')
-rw-r--r-- | sound/aoa/Kconfig | 2 | ||||
-rw-r--r-- | sound/aoa/codecs/Kconfig | 6 | ||||
-rw-r--r-- | sound/aoa/fabrics/Kconfig | 2 | ||||
-rw-r--r-- | sound/aoa/soundbus/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/Kconfig | 2 | ||||
-rw-r--r-- | sound/soc/samsung/Kconfig | 2 | ||||
-rw-r--r-- | sound/x86/Kconfig | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig index d70ca0f33c67..c58308ae4dc1 100644 --- a/sound/aoa/Kconfig +++ b/sound/aoa/Kconfig @@ -3,7 +3,7 @@ menuconfig SND_AOA tristate "Apple Onboard Audio driver" depends on PPC_PMAC select SND_PCM - ---help--- + help This option enables the new driver for the various Apple Onboard Audio components. diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig index 8ac13fdbcfe0..03f89dbcca75 100644 --- a/sound/aoa/codecs/Kconfig +++ b/sound/aoa/codecs/Kconfig @@ -3,7 +3,7 @@ config SND_AOA_ONYX tristate "support Onyx chip" select I2C select I2C_POWERMAC - ---help--- + help This option enables support for the Onyx (pcm3052) codec chip found in the latest Apple machines (most of those with digital audio output). @@ -12,14 +12,14 @@ config SND_AOA_TAS tristate "support TAS chips" select I2C select I2C_POWERMAC - ---help--- + help This option enables support for the tas chips found in a lot of Apple Machines, especially iBooks and PowerBooks without digital. config SND_AOA_TOONIE tristate "support Toonie chip" - ---help--- + help This option enables support for the toonie codec found in the Mac Mini. If you have a Mac Mini and want to hear sound, select this option. diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig index 1d8a718e9c56..0fa2da247ad2 100644 --- a/sound/aoa/fabrics/Kconfig +++ b/sound/aoa/fabrics/Kconfig @@ -3,7 +3,7 @@ config SND_AOA_FABRIC_LAYOUT tristate "layout-id fabric" select SND_AOA_SOUNDBUS select SND_AOA_SOUNDBUS_I2S - ---help--- + help This enables the layout-id fabric for the Apple Onboard Audio driver, the module holding it all together based on the device-tree's layout-id property. diff --git a/sound/aoa/soundbus/Kconfig b/sound/aoa/soundbus/Kconfig index ac084df0f97b..00189aac8014 100644 --- a/sound/aoa/soundbus/Kconfig +++ b/sound/aoa/soundbus/Kconfig @@ -2,7 +2,7 @@ config SND_AOA_SOUNDBUS tristate "Apple Soundbus support" select SND_PCM - ---help--- + help This option enables the generic driver for the soundbus support on Apple machines. @@ -11,5 +11,5 @@ config SND_AOA_SOUNDBUS config SND_AOA_SOUNDBUS_I2S tristate "I2S bus support" depends on SND_AOA_SOUNDBUS && PCI - ---help--- + help This option enables support for Apple I2S busses. diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index bdc305cece6e..71a6fe87d1a1 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -10,7 +10,7 @@ menuconfig SND_SOC select SND_JACK select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER - ---help--- + help If you want ASoC support, you should say Y here and also to the specific driver for your SoC platform below. diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 112911dc271b..99a49248e966 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -4,7 +4,7 @@ menuconfig SND_SOC_SAMSUNG depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM - ---help--- + help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to select the audio interfaces to support below. diff --git a/sound/x86/Kconfig b/sound/x86/Kconfig index 21f8919678fb..77777192f650 100644 --- a/sound/x86/Kconfig +++ b/sound/x86/Kconfig @@ -3,7 +3,7 @@ menuconfig SND_X86 bool "X86 sound devices" depends on X86 default y - ---help--- + help X86 sound devices that don't fall under SoC or PCI categories if SND_X86 |