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 /drivers/pnp/Kconfig | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz |
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/pnp/Kconfig')
-rw-r--r-- | drivers/pnp/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig index 39191bebcb28..a72141dffa29 100644 --- a/drivers/pnp/Kconfig +++ b/drivers/pnp/Kconfig @@ -7,7 +7,7 @@ menuconfig PNP bool "Plug and Play support" depends on HAS_IOMEM depends on ISA || ACPI - ---help--- + help Plug and Play (PnP) is a standard for peripherals which allows those peripherals to be configured by software, e.g. assign IRQ's or other parameters. No jumpers on the cards are needed, instead the values |