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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
include
/
linux
/
pci.h
diff --git
a/include/linux/pci.h
b/include/linux/pci.h
index
559d028
..
16c9f2e
100644
(file)
--- a/
include/linux/pci.h
+++ b/
include/linux/pci.h
@@
-1191,6
+1191,11
@@
static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
return 0;
}
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)
{
static inline pci_power_t pci_choose_state(struct pci_dev *dev,
pm_message_t state)
{
@@
-1479,6
+1484,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_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
/**
* pci_vpd_lrdt_size - Extracts the Large Resource Data Type length