Drop neuter_intel_microcode_load.patch (rhbz 690930)

kernel.spec

@@ -680,8 +680,6 @@ Patch12010: add-appleir-usb-driver.patch
 
 Patch12016: disable-i8042-check-on-apple-mac.patch
 
-Patch12018: neuter_intel_microcode_load.patch
-
 Patch12019: linux-2.6-rt2x00-Add-device-ID-for-RT539F-device.patch
 
 Patch12020: linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch
@@ -1269,8 +1267,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch
 
 ApplyPatch add-appleir-usb-driver.patch
 
-ApplyPatch neuter_intel_microcode_load.patch
-
 ApplyPatch linux-2.6-rt2x00-Add-device-ID-for-RT539F-device.patch
 
 ApplyPatch udlfb-bind-framebuffer-to-interface.patch
@@ -1902,6 +1898,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 04 2011 Dave Jones <davej@redhat.com>
+- Drop neuter_intel_microcode_load.patch (rhbz 690930)
+
 * Wed Aug 03 2011 John W. Linville <linville@redhat.com>
 - Disable CONFIG_BCMA since no driver currently uses it (rhbz 727796)
 

neuter_intel_microcode_load.patch

@@ -1,24 +0,0 @@
-diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
-index ebd193e..c57024a 100644
---- a/arch/x86/kernel/microcode_intel.c
-+++ b/arch/x86/kernel/microcode_intel.c
-@@ -453,9 +453,18 @@ static void microcode_fini_cpu(int cpu)
- 	uci->mc = NULL;
- }
- 
-+/* we don't ship the broken out files...
-+ *  instead, we'll just fail here, and load it with microcode_ctl
-+ */
-+static enum ucode_state noop_request_microcode_fw(int cpu,
-+	struct device *device)
-+{
-+	return UCODE_NFOUND;
-+}
-+
- static struct microcode_ops microcode_intel_ops = {
- 	.request_microcode_user		  = request_microcode_user,
--	.request_microcode_fw             = request_microcode_fw,
-+	.request_microcode_fw             = noop_request_microcode_fw,
- 	.collect_cpu_info                 = collect_cpu_info,
- 	.apply_microcode                  = apply_microcode,
- 	.microcode_fini_cpu               = microcode_fini_cpu,