diff --git a/Makefile b/Makefile
index dabc68c..d186d89 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/' config-nodebug
-	#@perl -pi -e 's/# CONFIG_PCI_DEFAULT_USE_CRS is not set/CONFIG_PCI_DEFAULT_USE_CRS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
 
 	@perl -pi -e 's/# CONFIG_DEBUG_SET_MODULE_RONX is not set/CONFIG_DEBUG_SET_MODULE_RONX=y/' config-nodebug
@@ -172,7 +171,6 @@ release:
 	#@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/' config-nodebug
-	#@perl -pi -e 's/CONFIG_PCI_DEFAULT_USE_CRS=y/# CONFIG_PCI_DEFAULT_USE_CRS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_DEBUG_SET_MODULE_RONX=y/# CONFIG_DEBUG_SET_MODULE_RONX is not set/' config-nodebug
diff --git a/kernel.spec b/kernel.spec
index f4764b0..0859cc2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -630,7 +630,6 @@ Patch202: linux-2.6-debug-taint-vm.patch
 Patch203: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch204: linux-2.6-debug-always-inline-kzalloc.patch
 
-Patch381: linux-2.6-defaults-pci_use_crs.patch
 Patch383: linux-2.6-defaults-aspm.patch
 
 Patch390: linux-2.6-defaults-acpi-video.patch
@@ -1211,7 +1210,6 @@ ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 #
 # PCI
 #
-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
 
@@ -1930,6 +1928,7 @@ fi
 * Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com>
 - linux-2.6-defaults-pci_no_msi.patch: drop, haven't toggled the default
   in many moons.
+- linux-2.6-defaults-pci_use_crs.patch: ditto.
 
 * Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc3.git5.1
 - Try updating to a git snapshot for the first time in 3.0-rc,
diff --git a/linux-2.6-defaults-pci_use_crs.patch b/linux-2.6-defaults-pci_use_crs.patch
deleted file mode 100644
index 18acee1..0000000
--- a/linux-2.6-defaults-pci_use_crs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index cea0cd9..c326065 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -2142,3 +2142,8 @@ source "crypto/Kconfig"
- source "arch/x86/kvm/Kconfig"
- 
- source "lib/Kconfig"
-+
-+config PCI_DEFAULT_USE_CRS
-+	def_bool y
-+	prompt "Use PCI Host Bridge Windows from ACPI by default?"
-+	depends on ACPI
-diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
-index 15466c0..3099406 100644
---- a/arch/x86/pci/acpi.c
-+++ b/arch/x86/pci/acpi.c
-@@ -16,7 +16,11 @@ struct pci_root_info {
- 	int busnum;
- };
- 
-+#ifdef CONFIG_PCI_DEFAULT_USE_CRS
- static bool pci_use_crs = true;
-+#else
-+static bool pci_use_crs = false;
-+#endif
- 
- static int __init set_use_crs(const struct dmi_system_id *id)
- {