]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'pci/kconfig'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:49 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:49 +0000 (16:10 -0500)
commit0ecda3a087462eb89c1d9227deea998d8cd014e8
treedf588bfe9c79c700639c8cc3addbc9d808a9a165
parent73144d77cb87d60b4bcab6992a62d6787b09dcf0
parentf3fdfc4ac3a26865e84627a7fe08a906081e5abc
Merge branch 'pci/kconfig'

  - remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig
    selections (Bjorn Helgaas)

* pci/kconfig:
  PCI: Remove host driver Kconfig selection of CONFIG_PCIEPORTBUS

# Conflicts:
# drivers/pci/dwc/Kconfig
# drivers/pci/host/Kconfig
drivers/pci/dwc/Kconfig
drivers/pci/host/Kconfig