diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 19:32:01 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 19:32:01 (GMT) |
commit | cc3a1378b4dd45d3e78dd4aeb10641b06a87d614 (patch) | |
tree | 4eb9dc8f7cefc44926f886c467992e769b873c69 /drivers/pci/pci.c | |
parent | ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (diff) | |
download | linux-cc3a1378b4dd45d3e78dd4aeb10641b06a87d614.tar.xz |
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 b3e9294..04aac77 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -18,7 +18,6 @@ #include <linux/spinlock.h> #include <linux/string.h> #include <linux/log2.h> -#include <linux/aspm.h> #include <asm/dma.h> /* isa_dma_bridge_buggy */ #include "pci.h" @@ -520,9 +519,6 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) if (need_restore) pci_restore_bars(dev); - if (dev->bus->self) - pcie_aspm_pm_state_change(dev->bus->self); - return 0; } |