summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-11 14:36:05 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-11 14:36:05 -0500
commit03f8e6abc95f335b1390d203ac769d6589eac61f (patch)
tree5492b7c0e099fe7ee5194efaf044590a6a1365a7 /kernel.spec
parent2be549056941a6d25e0a78978210b8314df69fa5 (diff)
downloadkernel-03f8e6abc95f335b1390d203ac769d6589eac61f.tar.gz
kernel-03f8e6abc95f335b1390d203ac769d6589eac61f.tar.xz
kernel-03f8e6abc95f335b1390d203ac769d6589eac61f.zip
Add patch to rework ASPM handling from Matthew Garrett
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index baceb5d66..f93eaac55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -706,6 +706,8 @@ Patch21080: sysfs-msi-irq-per-device.patch
Patch21090: bcma-brcmsmac-compat.patch
+Patch21091: pci-Rework-ASPM-disable-code.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1345,6 +1347,8 @@ ApplyPatch sysfs-msi-irq-per-device.patch
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
ApplyPatch bcma-brcmsmac-compat.patch
+ApplyPatch pci-Rework-ASPM-disable-code.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2051,6 +2055,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Nov 11 2011 Josh Boyer <jwboyer@redhat.com>
+- Add reworked pci ASPM patch from Matthew Garrett
+
* Fri Nov 11 2011 John W. Linville <linville@redhat.com>
- Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331