diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:42:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:42:16 -0800 |
commit | 7cf7669143db087e5cb36d1e07143938ff467147 (patch) | |
tree | 30bd5643d4f799badeb37a6a7cc47500d4a4eb36 /drivers/pci/pci.c | |
parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
parent | 451124a7cc6c89fcb83d48082c7290f16f652f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: fix 4x section mismatch warnings
PCI: fix section mismatch warnings referring to pci_do_scan_bus
pci: pci_enable_device_bars() fix for lpfc driver
Revert "PCI: PCIE ASPM support"
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 b3e9294e4a0..04aac778246 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; } |