rpms/kernel/devel kernel-2.6.spec, 1.1843, 1.1844 linux-2.6-x86_64-ati-apic-timer.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25836

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-x86_64-ati-apic-timer.patch 
Log Message:
Fix ATI regression



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1843
retrieving revision 1.1844
diff -u -r1.1843 -r1.1844
--- kernel-2.6.spec	11 Jan 2006 13:04:20 -0000	1.1843
+++ kernel-2.6.spec	11 Jan 2006 21:59:09 -0000	1.1844
@@ -221,8 +221,7 @@
 Patch203: linux-2.6.14-intel-cache-build.patch
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch
-Patch206: linux-2.6-x86_64-ati-apic-timer.patch
-Patch207: linux-2.6-edid-check.patch
+Patch206: linux-2.6-edid-check.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.15-default-powerpc.patch
@@ -617,10 +616,8 @@
 %patch204 -p1
 # Disable guessing of how many hotplug cpus to add.
 %patch205 -p1
-# ATI timer quirk.
-%patch206 -p1
 # Reboot thru bios on HP laptops.
-%patch207 -p1
+%patch206 -p1
 
 # 
 # ppc64
@@ -1357,6 +1354,9 @@
 %endif
 
 %changelog
+* Wed Jan 11 2006 Dave Jones <davej at redhat.com>
+- Make ATI chipset based x86-64 machines boot again.
+
 * Wed Jan 11 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.15-git7
 - Turn off CONFIG_DEBUG_MUTEXES since it makes the G5 not boot


--- linux-2.6-x86_64-ati-apic-timer.patch DELETED ---