diff options
| author | Linus Torvalds | 2020-06-13 13:29:16 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-06-13 13:29:16 -0700 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/pci | |
| 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 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index b08efea39496..adddf21fa381 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -248,7 +248,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU tristate "Intel Volume Management Device Driver" - ---help--- + help Adds support for the Intel Volume Management Device (VMD). VMD is a secondary PCI host bridge that allows PCI Express root ports, and devices attached to them, to be removed from the default diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 32455a79372d..840a84bb5ee2 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -6,7 +6,7 @@ menuconfig HOTPLUG_PCI bool "Support for PCI Hotplug" depends on PCI && SYSFS - ---help--- + help Say Y here if you have a motherboard with a PCI Hotplug controller. This allows you to add and remove PCI cards while the machine is powered up and running. |