aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-02-02 14:32:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-02 14:32:01 -0500
commitcc3a1378b4dd45d3e78dd4aeb10641b06a87d614 (patch)
tree4eb9dc8f7cefc44926f886c467992e769b873c69 /include/linux/pci.h
parentae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (diff)
Revert "PCI: PCIE ASPM support"
This reverts commit 6c723d5bd89f03fc3ef627d50f89ade054d2ee3b. It caused build errors on non-x86 platforms, config file confusion, and even some boot errors on some x86-64 boxes. All around, not quite ready for prime-time :( Cc: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4f96f1d94ac4..cee75c0ff6e7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -128,7 +128,6 @@ struct pci_cap_saved_state {
128 u32 data[0]; 128 u32 data[0];
129}; 129};
130 130
131struct pcie_link_state;
132/* 131/*
133 * The pci_dev structure is used to describe PCI devices. 132 * The pci_dev structure is used to describe PCI devices.
134 */ 133 */
@@ -164,10 +163,6 @@ struct pci_dev {
164 this is D0-D3, D0 being fully functional, 163 this is D0-D3, D0 being fully functional,
165 and D3 being off. */ 164 and D3 being off. */
166 165
167#ifdef CONFIG_PCIEASPM
168 struct pcie_link_state *link_state; /* ASPM link state. */
169#endif
170
171 pci_channel_state_t error_state; /* current connectivity state */ 166 pci_channel_state_t error_state; /* current connectivity state */
172 struct device dev; /* Generic device interface */ 167 struct device dev; /* Generic device interface */
173 168