summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-12-10 10:51:13 -0500
committerKyle McMartin <kyle@redhat.com>2010-12-10 10:51:13 -0500
commit39ad3b9d9e16b880ae175af2f3bf02af4c3b6e28 (patch)
tree653cfab92f1f504e7c0c2f8ea4493a0866303a11 /kernel.spec
parent5d5148cd48f9a2a1067e878092de7142b379e83b (diff)
downloadkernel-39ad3b9d9e16b880ae175af2f3bf02af4c3b6e28.tar.gz
kernel-39ad3b9d9e16b880ae175af2f3bf02af4c3b6e28.tar.xz
kernel-39ad3b9d9e16b880ae175af2f3bf02af4c3b6e28.zip
PCI: Disable ASPM if BIOS asks us to
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 9286d8014..054236d2a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -612,6 +612,7 @@ Patch204: linux-2.6-debug-always-inline-kzalloc.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
+Patch384: pci-disable-aspm-if-bios-asks-us-to.patch
Patch385: ima-allow-it-to-be-completely-disabled-and-default-off.patch
@@ -1194,6 +1195,7 @@ ApplyPatch linux-2.6-defaults-pci_no_msi.patch
ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
+ApplyPatch pci-disable-aspm-if-bios-asks-us-to.patch
#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
@@ -1926,6 +1928,10 @@ fi
# || ||
%changelog
+* Fri Dec 10 2010 Kyle McMartin <kyle@redhat.com>
+- pci-disable-aspm-if-bios-asks-us-to.patch: Patch from mjg59 to disable
+ ASPM if the BIOS has disabled it, but enabled it already on some devices.
+
* Thu Dec 09 2010 Kyle McMartin <kyle@redhat.com>
- Snarf patch from wireless-next to fix mdomsch's orinico wifi.
(orinoco: initialise priv->hw before assigning the interrupt)