Merge branch 'pci/enumeration'

[linux.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index f7aa6d9f8999a71cf7317f872b5b61cfb2858b47..2619ab35dae9d448e99ebb52c91c4c9572a41c5d 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -474,6 +474,7 @@ struct pci_host_bridge {
        unsigned int    native_aer:1;           /* OS may use PCIe AER */
        unsigned int    native_hotplug:1;       /* OS may use PCIe hotplug */
        unsigned int    native_pme:1;           /* OS may use PCIe PME */
+       unsigned int    native_ltr:1;           /* OS may use PCIe LTR */
        /* Resource alignment requirements */
        resource_size_t (*align_resource)(struct pci_dev *dev,
                        const struct resource *res,
@@ -2283,7 +2284,7 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)
        return false;
 }
 
-#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH)
+#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH)
 void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);
 #endif