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/pcie/Kconfig | |
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/pcie/Kconfig')
-rw-r--r-- | drivers/pci/pcie/Kconfig | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index 60104cf9879..287a9311716 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -26,23 +26,3 @@ config HOTPLUG_PCI_PCIE When in doubt, say N. source "drivers/pci/pcie/aer/Kconfig" - -# -# PCI Express ASPM -# -config PCIEASPM - bool "PCI Express ASPM support(Experimental)" - depends on PCI && EXPERIMENTAL - default y - help - This enables PCI Express ASPM (Active State Power Management) and - Clock Power Management. ASPM supports state L0/L0s/L1. - - When in doubt, say N. -config PCIEASPM_DEBUG - bool "Debug PCI Express ASPM" - depends on PCIEASPM - default n - help - This enables PCI Express ASPM debug support. It will add per-device - interface to control ASPM. |