cb331c3fc5
to 4.x which still does need it (since pci_if.h isn't generated without pci being present)
to 4.x which still does need it (since pci_if.h isn't generated without pci being present)