diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 14:32:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 14:32:01 -0500 |
commit | cc3a1378b4dd45d3e78dd4aeb10641b06a87d614 (patch) | |
tree | 4eb9dc8f7cefc44926f886c467992e769b873c69 /drivers/pci/pci.c | |
parent | ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (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 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b3e9294e4a0e..04aac7782468 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
20 | #include <linux/log2.h> | 20 | #include <linux/log2.h> |
21 | #include <linux/aspm.h> | ||
22 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ | 21 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ |
23 | #include "pci.h" | 22 | #include "pci.h" |
24 | 23 | ||
@@ -520,9 +519,6 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
520 | if (need_restore) | 519 | if (need_restore) |
521 | pci_restore_bars(dev); | 520 | pci_restore_bars(dev); |
522 | 521 | ||
523 | if (dev->bus->self) | ||
524 | pcie_aspm_pm_state_change(dev->bus->self); | ||
525 | |||
526 | return 0; | 522 | return 0; |
527 | } | 523 | } |
528 | 524 | ||