git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
pci
/
pcie
/
aer
/
aerdrv.h
diff --git
a/drivers/pci/pcie/aer/aerdrv.h
b/drivers/pci/pcie/aer/aerdrv.h
index
80c11d1
..
9656e30
100644
(file)
--- a/
drivers/pci/pcie/aer/aerdrv.h
+++ b/
drivers/pci/pcie/aer/aerdrv.h
@@
-132,6
+132,7
@@
static inline int aer_osc_setup(struct pcie_device *pciedev)
#ifdef CONFIG_ACPI_APEI
extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
#ifdef CONFIG_ACPI_APEI
extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
+extern bool aer_acpi_firmware_first(void);
#else
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
{
#else
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
{
@@
-139,6
+140,8
@@
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
return pci_dev->__aer_firmware_first;
return 0;
}
return pci_dev->__aer_firmware_first;
return 0;
}
+
+static inline bool aer_acpi_firmware_first(void) { return false; }
#endif
static inline void pcie_aer_force_firmware_first(struct pci_dev *pci_dev,
#endif
static inline void pcie_aer_force_firmware_first(struct pci_dev *pci_dev,