rpms/kernel/F-11 drm-next.patch, 1.13, 1.14 kernel.spec, 1.1555, 1.1556

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25606

Modified Files:
	drm-next.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
- drm-next.patch: backport fix to drm-next


drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- drm-next.patch	6 Apr 2009 05:30:06 -0000	1.13
+++ drm-next.patch	17 Apr 2009 11:07:14 -0000	1.14
@@ -7347,7 +7347,7 @@
 -	intel_tv_mode_set(&intel_output->enc, NULL, NULL);
 +	if (changed && crtc)
 +		drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
-+				crtc->y, crtc->fb);
++				crtc->y, crtc->fb, 0);
  out:
  	return ret;
  }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1555
retrieving revision 1.1556
diff -u -r1.1555 -r1.1556
--- kernel.spec	17 Apr 2009 10:37:37 -0000	1.1555
+++ kernel.spec	17 Apr 2009 11:07:15 -0000	1.1556
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
+- drm-next.patch: backport fix to drm-next
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-93
 - drm modesetting: friday patch, missed a git add