OSDN Git Service

Merge branch 'remotes/lorenzo/pci/host-generic'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:16 +0000 (12:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:16 +0000 (12:59 -0500)
commitd388e541e2e3e26adfd9b1c99144176a73e19f95
tree05b6e3b71ec742b52896c3ce6d87469b8aad7a15
parentd611b2b85331f3c69863d78835e95d1a5d01f2ef
parentb2f75a41eaa6bfc4aa6f6a1faefbf21c2c8d1588
Merge branch 'remotes/lorenzo/pci/host-generic'

  - Constify struct pci_ecam_ops (Rob Herring)

  - Support building as modules (Rob Herring)

  - Eliminate wrappers for pci_host_common_probe() by using DT match table
    data (Rob Herring)

* remotes/lorenzo/pci/host-generic:
  PCI: host-generic: Eliminate pci_host_common_probe wrappers
  PCI: host-generic: Support building as modules
  PCI: Constify struct pci_ecam_ops

# Conflicts:
# drivers/pci/controller/dwc/pcie-hisi.c
drivers/pci/controller/dwc/pcie-hisi.c
drivers/pci/controller/pcie-tango.c
drivers/pci/setup-bus.c
include/linux/pci-acpi.h