rpms/kernel/devel kernel.spec,1.913,1.914

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2988

Modified Files:
	kernel.spec 
Log Message:
* Fri Aug 29 2008 Kristian Høgsberg <krh at redhat.com>
- Fix a couple of merge bugs between DRI2 and KMS.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- kernel.spec	29 Aug 2008 01:19:00 -0000	1.913
+++ kernel.spec	29 Aug 2008 19:31:27 -0000	1.914
@@ -606,6 +606,7 @@
 
 # nouveau + drm fixes
 Patch1811: drm-modesetting-radeon.patch
+Patch1812: fixup-dri2-kms-merge.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1147,6 +1148,7 @@
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch fixup-dri2-kms-merge.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1739,6 +1741,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Aug 29 2008 Kristian Høgsberg <krh at redhat.com>
+- Fix a couple of merge bugs between DRI2 and KMS.
+
 * Thu Aug 28 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc5