diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 20:32:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 20:32:01 +0100 |
| commit | cc3a1378b4dd45d3e78dd4aeb10641b06a87d614 (patch) | |
| tree | 4eb9dc8f7cefc44926f886c467992e769b873c69 /drivers/pci/pci-sysfs.c | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| download | linux-cc3a1378b4dd45d3e78dd4aeb10641b06a87d614.tar.xz linux-cc3a1378b4dd45d3e78dd4aeb10641b06a87d614.zip | |
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-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index abf4203304e4..8dcf1458aa2f 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -21,7 +21,6 @@ #include <linux/topology.h> #include <linux/mm.h> #include <linux/capability.h> -#include <linux/aspm.h> #include "pci.h" static int sysfs_initialized; /* = 0 */ @@ -651,8 +650,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) if (pcibios_add_platform_entries(pdev)) goto err_rom_file; - pcie_aspm_create_sysfs_dev_files(pdev); - return 0; err_rom_file: @@ -682,8 +679,6 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) if (!sysfs_initialized) return; - pcie_aspm_remove_sysfs_dev_files(pdev); - if (pdev->cfg_size < 4096) sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr); else |