diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:14 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:14 -0500 |
| commit | 94f543b276e99ca311903f1b9fac2db6d1f020d7 (patch) | |
| tree | b545dfcc0399f1e764bd4c1005dd2717248e59f2 | |
| parent | 13108c625b1db803b7b24702360a735fd764622f (diff) | |
| parent | de5bbdd01cf9ee3cd4586b5a970d3ea015c6d7e3 (diff) | |
| download | lwn-94f543b276e99ca311903f1b9fac2db6d1f020d7.tar.gz lwn-94f543b276e99ca311903f1b9fac2db6d1f020d7.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Change pci_host_common_probe() visibility
PCI: Fix typo pci_cfg_access_lock() comment
PCI: Include pci.h for struct pci_ops definition
| -rw-r--r-- | drivers/pci/access.c | 2 | ||||
| -rw-r--r-- | include/linux/pci-ecam.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 9b09cd31158c..74cf5fffb1e1 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -629,7 +629,7 @@ void pci_vpd_release(struct pci_dev *dev) * * When access is locked, any userspace reads or writes to config * space and concurrent lock requests will sleep until access is - * allowed via pci_cfg_access_unlocked again. + * allowed via pci_cfg_access_unlock() again. */ void pci_cfg_access_lock(struct pci_dev *dev) { diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index f0d2b9451270..809c2f1873ac 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -16,6 +16,7 @@ #ifndef DRIVERS_PCI_ECAM_H #define DRIVERS_PCI_ECAM_H +#include <linux/pci.h> #include <linux/kernel.h> #include <linux/platform_device.h> @@ -68,7 +69,7 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */ extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */ #endif -#ifdef CONFIG_PCI_HOST_GENERIC +#ifdef CONFIG_PCI_HOST_COMMON /* for DT-based PCI controllers that support ECAM */ int pci_host_common_probe(struct platform_device *pdev, struct pci_ecam_ops *ops); |