Merge branch 'x86/urgent' into x86-mm

[~andy/linux] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 559d028970752672cc92260eb7b64c61276f5e89..96f70d7e058dd043716ae216e3918567923f28bb 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1002,12 +1002,11 @@ extern bool pcie_ports_auto;
 #endif
 
 #ifndef CONFIG_PCIEASPM
-static inline int pcie_aspm_enabled(void)
-{
-       return 0;
-}
+static inline int pcie_aspm_enabled(void) { return 0; }
+static inline bool pcie_aspm_support_enabled(void) { return false; }
 #else
 extern int pcie_aspm_enabled(void);
+extern bool pcie_aspm_support_enabled(void);
 #endif
 
 #ifdef CONFIG_PCIEAER
@@ -1191,6 +1190,11 @@ static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
        return 0;
 }
 
+static inline int pci_wake_from_d3(struct pci_dev *dev, bool enable)
+{
+       return 0;
+}
+
 static inline pci_power_t pci_choose_state(struct pci_dev *dev,
                                           pm_message_t state)
 {
@@ -1479,6 +1483,7 @@ void pci_request_acs(void);
 #define PCI_VPD_RO_KEYWORD_PARTNO      "PN"
 #define PCI_VPD_RO_KEYWORD_MFR_ID      "MN"
 #define PCI_VPD_RO_KEYWORD_VENDOR0     "V0"
+#define PCI_VPD_RO_KEYWORD_CHKSUM      "RV"
 
 /**
  * pci_vpd_lrdt_size - Extracts the Large Resource Data Type length