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-sysfs.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-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 @@ | |||
21 | #include <linux/topology.h> | 21 | #include <linux/topology.h> |
22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
23 | #include <linux/capability.h> | 23 | #include <linux/capability.h> |
24 | #include <linux/aspm.h> | ||
25 | #include "pci.h" | 24 | #include "pci.h" |
26 | 25 | ||
27 | static int sysfs_initialized; /* = 0 */ | 26 | static int sysfs_initialized; /* = 0 */ |
@@ -651,8 +650,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) | |||
651 | if (pcibios_add_platform_entries(pdev)) | 650 | if (pcibios_add_platform_entries(pdev)) |
652 | goto err_rom_file; | 651 | goto err_rom_file; |
653 | 652 | ||
654 | pcie_aspm_create_sysfs_dev_files(pdev); | ||
655 | |||
656 | return 0; | 653 | return 0; |
657 | 654 | ||
658 | err_rom_file: | 655 | err_rom_file: |
@@ -682,8 +679,6 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) | |||
682 | if (!sysfs_initialized) | 679 | if (!sysfs_initialized) |
683 | return; | 680 | return; |
684 | 681 | ||
685 | pcie_aspm_remove_sysfs_dev_files(pdev); | ||
686 | |||
687 | if (pdev->cfg_size < 4096) | 682 | if (pdev->cfg_size < 4096) |
688 | sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr); | 683 | sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr); |
689 | else | 684 | else |