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/probe.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/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8b505bd925aa..34fa0397b55d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/cpumask.h> | 11 | #include <linux/cpumask.h> |
12 | #include <linux/aspm.h> | ||
13 | #include "pci.h" | 12 | #include "pci.h" |
14 | 13 | ||
15 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ | 14 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ |
@@ -1002,10 +1001,6 @@ int pci_scan_slot(struct pci_bus *bus, int devfn) | |||
1002 | break; | 1001 | break; |
1003 | } | 1002 | } |
1004 | } | 1003 | } |
1005 | |||
1006 | if (bus->self) | ||
1007 | pcie_aspm_init_link_state(bus->self); | ||
1008 | |||
1009 | return nr; | 1004 | return nr; |
1010 | } | 1005 | } |
1011 | 1006 | ||