Commit 30b5b880 authored by Tero Roponen's avatar Tero Roponen Committed by Bjorn Helgaas
Browse files

PCI: Restore inclusion of pci/hotplug Kconfig

Commit e7e127e3 ("PCI: Include pci/hotplug Kconfig directly from
pci/Kconfig") added one line to pci/Kconfig.  However, for some mysterious
reason it isn't there now, even though there are no traces of removing it
in the git log.

I detected this issue when 'make oldconfig' removed all the options that
depended on HOTPLUG_PCI.

[bhelgaas: I botched the cfeb8139 ("Merge branch 'pci/host-hv' into
next") merge.  "git diff cfeb8139^ cfeb8139

" shows a conflict in
drivers/pci/Kconfig, and I mistakenly dropped the hotplug/Kconfig piece.]
Signed-off-by: default avatarTero Roponen <tero.roponen@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 643ad15d
...@@ -128,4 +128,5 @@ config PCI_HYPERV ...@@ -128,4 +128,5 @@ config PCI_HYPERV
The PCI device frontend driver allows the kernel to import arbitrary The PCI device frontend driver allows the kernel to import arbitrary
PCI devices from a PCI backend to support PCI driver domains. PCI devices from a PCI backend to support PCI driver domains.
source "drivers/pci/hotplug/Kconfig"
source "drivers/pci/host/Kconfig" source "drivers/pci/host/Kconfig"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment