diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 22:29:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 22:29:16 +0200 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/clk/versatile | |
parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
parent | treewide: replace '---help---' in Kconfig files with 'help' (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.zip |
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 'drivers/clk/versatile')
-rw-r--r-- | drivers/clk/versatile/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig index 8c1b0e8e8d32..91f0ff54237d 100644 --- a/drivers/clk/versatile/Kconfig +++ b/drivers/clk/versatile/Kconfig @@ -7,7 +7,7 @@ menu "Clock driver for ARM Reference designs" config ICST bool "Clock driver for ARM Reference designs ICST" select REGMAP_MMIO - ---help--- + help Supports clocking on ARM Reference designs: - Integrator/AP and Integrator/CP - RealView PB1176, EB, PB11MP and PBX @@ -15,7 +15,7 @@ config ICST config CLK_SP810 bool "Clock driver for ARM SP810 System Controller" default y if (ARCH_VEXPRESS && ARM) - ---help--- + help Supports clock muxing (REFCLK/TIMCLK to TIMERCLKEN0-3) capabilities of the ARM SP810 System Controller cell. @@ -24,7 +24,7 @@ config CLK_VEXPRESS_OSC depends on VEXPRESS_CONFIG select REGMAP_MMIO default y if ARCH_VEXPRESS - ---help--- + help Simple regmap-based driver driving clock generators on Versatile Express platforms hidden behind its configuration infrastructure, commonly known as OSCs. |