diff options
| author | Tero Roponen <[email protected]> | 2016-03-21 07:26:41 +0000 |
|---|---|---|
| committer | Bjorn Helgaas <[email protected]> | 2016-03-21 12:33:34 +0000 |
| commit | 30b5b8808c12bcd947dd474980482561b69c1bcb (patch) | |
| tree | a4b2da457230e77144df046e0ea2b23891874792 /net/switchdev/switchdev.c | |
| parent | Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-30b5b8808c12bcd947dd474980482561b69c1bcb.tar.gz kernel-30b5b8808c12bcd947dd474980482561b69c1bcb.zip | |
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 <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions