[kernel/f14/master] Revert 102e2d67

[Kyle McMartin]

commit 88a50a0b1db983928abbe0b7417644632fbac348
Author: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date:   Fri Sep 10 10:33:28 2010 -0400

    Revert 102e2d67
    
    This reverts commit 102e2d671806d134b32371aedbc78dfac9950fb9 which
    accidentally snuck into the wrong branch.

 bjorn-pci-crs-rollup-v3.patch |  256 -----------------------------------------
 kernel.spec                   |   10 +--
 2 files changed, 2 insertions(+), 264 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 62a4c21..cccddb1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,7 +23,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-%define buildid .bz620313
+# % define buildid .local
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -614,8 +614,6 @@ Patch204: linux-2.6-debug-always-inline-kzalloc.patch
 
 Patch300: create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
 
-Patch370: bjorn-pci-crs-rollup-v3.patch
-
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-defaults-pci_use_crs.patch
 Patch382: linux-2.6-defaults-no-pm-async.patch
@@ -1212,8 +1210,7 @@ ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 #
 # make default state of PCI MSI a config option
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-#ApplyPatch linux-2.6-defaults-pci_use_crs.patch
-ApplyPatch bjorn-pci-crs-rollup-v3.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
 # disable aspm if acpi doesn't provide an _OSC method
@@ -1931,9 +1928,6 @@ fi
 # and build.
 
 %changelog
-* Fri Sep 10 2010 Kyle McMartin <kyle at redhat.com>
-- Suck in patch from Bjorn to try to fix pci=use_crs
-
 * Fri Sep 10 2010 Chuck Ebbert <cebbert at redhat.com>
 - Disable asynchronous suspend by default.