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 'staging-next' into Linux 3.1
[pandora-kernel.git]
/
include
/
linux
/
pci.h
diff --git
a/include/linux/pci.h
b/include/linux/pci.h
index
8c230cb
..
9fc0122
100644
(file)
--- a/
include/linux/pci.h
+++ b/
include/linux/pci.h
@@
-621,8
+621,9
@@
struct pci_driver {
extern void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
enum pcie_bus_config_types {
extern void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
enum pcie_bus_config_types {
- PCIE_BUS_
PERFORMANCE
,
+ PCIE_BUS_
TUNE_OFF
,
PCIE_BUS_SAFE,
PCIE_BUS_SAFE,
+ PCIE_BUS_PERFORMANCE,
PCIE_BUS_PEER2PEER,
};
PCIE_BUS_PEER2PEER,
};