aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/access.c2
-rw-r--r--include/linux/pci-ecam.h3
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)
629 * 629 *
630 * When access is locked, any userspace reads or writes to config 630 * When access is locked, any userspace reads or writes to config
631 * space and concurrent lock requests will sleep until access is 631 * space and concurrent lock requests will sleep until access is
632 * allowed via pci_cfg_access_unlocked again. 632 * allowed via pci_cfg_access_unlock() again.
633 */ 633 */
634void pci_cfg_access_lock(struct pci_dev *dev) 634void pci_cfg_access_lock(struct pci_dev *dev)
635{ 635{
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 @@
16#ifndef DRIVERS_PCI_ECAM_H 16#ifndef DRIVERS_PCI_ECAM_H
17#define DRIVERS_PCI_ECAM_H 17#define DRIVERS_PCI_ECAM_H
18 18
19#include <linux/pci.h>
19#include <linux/kernel.h> 20#include <linux/kernel.h>
20#include <linux/platform_device.h> 21#include <linux/platform_device.h>
21 22
@@ -68,7 +69,7 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */
68extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */ 69extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */
69#endif 70#endif
70 71
71#ifdef CONFIG_PCI_HOST_GENERIC 72#ifdef CONFIG_PCI_HOST_COMMON
72/* for DT-based PCI controllers that support ECAM */ 73/* for DT-based PCI controllers that support ECAM */
73int pci_host_common_probe(struct platform_device *pdev, 74int pci_host_common_probe(struct platform_device *pdev,
74 struct pci_ecam_ops *ops); 75 struct pci_ecam_ops *ops);