diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:16 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:16 -0500 |
| commit | d388e541e2e3e26adfd9b1c99144176a73e19f95 (patch) | |
| tree | 05b6e3b71ec742b52896c3ce6d87469b8aad7a15 /drivers/pci/setup-bus.c | |
| parent | d611b2b85331f3c69863d78835e95d1a5d01f2ef (diff) | |
| parent | b2f75a41eaa6bfc4aa6f6a1faefbf21c2c8d1588 (diff) | |
| download | linux-d388e541e2e3e26adfd9b1c99144176a73e19f95.tar.gz | |
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
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 07cd7a3817dcd..9b94b1f16d80e 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -26,6 +26,7 @@ #include "pci.h" unsigned int pci_flags; +EXPORT_SYMBOL_GPL(pci_flags); struct pci_dev_resource { struct list_head list; |