rpms/kernel/devel kernel.spec, 1.306, 1.307 linux-2.6-defaults-nonmi.patch, 1.2, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28112

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-defaults-nonmi.patch 
Log Message:
no longer needed, is default upstream now.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- kernel.spec	13 Dec 2007 22:13:24 -0000	1.306
+++ kernel.spec	13 Dec 2007 22:22:30 -0000	1.307
@@ -616,7 +616,6 @@
 Patch590: linux-2.6-unexport-symbols.patch
 Patch600: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
-Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
@@ -1111,8 +1110,6 @@
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
 ApplyPatch linux-2.6-defaults-fat-utf8.patch
-# Disable NMI watchdog by default.
-ApplyPatch linux-2.6-defaults-nonmi.patch
 
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch


--- linux-2.6-defaults-nonmi.patch DELETED ---