From: Tero Roponen Date: Mon, 21 Mar 2016 07:26:41 +0000 (+0200) Subject: PCI: Restore inclusion of pci/hotplug Kconfig X-Git-Tag: v4.6-rc1~54^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30b5b8808c12bcd947dd474980482561b69c1bcb;p=karo-tx-linux.git PCI: Restore inclusion of pci/hotplug Kconfig Commit e7e127e3c767 ("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 cfeb8139a1fb ("Merge branch 'pci/host-hv' into next") merge. "git diff cfeb8139a1fb^ cfeb8139a1fb" shows a conflict in drivers/pci/Kconfig, and I mistakenly dropped the hotplug/Kconfig piece.] Signed-off-by: Tero Roponen Signed-off-by: Bjorn Helgaas --- diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index a1f37db745ab..209292e067d2 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -128,4 +128,5 @@ config PCI_HYPERV The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. +source "drivers/pci/hotplug/Kconfig" source "drivers/pci/host/Kconfig"