rpms/kernel/F-12 drm-intel-no-tv-hotplug.patch, 1.2, 1.3 kernel.spec, 1.1972, 1.1973

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-no-tv-hotplug.patch 
Log Message:
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-13
- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
  2.6.31 (#522611, #544671)


drm-intel-no-tv-hotplug.patch:
 i915_reg.h |    1 -
 1 file changed, 1 deletion(-)

Index: drm-intel-no-tv-hotplug.patch
===================================================================
RCS file: drm-intel-no-tv-hotplug.patch
diff -N drm-intel-no-tv-hotplug.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-no-tv-hotplug.patch	11 Jan 2010 16:41:49 -0000	1.3
@@ -0,0 +1,11 @@
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx	2009-09-16 13:36:20.000000000 -0400
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-09-16 13:40:32.000000000 -0400
+@@ -836,7 +836,6 @@
+ 			 HDMID_HOTPLUG_INT_EN |	  \
+ 			 SDVOB_HOTPLUG_INT_EN |	  \
+ 			 SDVOC_HOTPLUG_INT_EN |	  \
+-			 TV_HOTPLUG_INT_EN |	  \
+ 			 CRT_HOTPLUG_INT_EN)
+ 
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -p -r1.1972 -r1.1973
--- kernel.spec	11 Jan 2010 16:19:53 -0000	1.1972
+++ kernel.spec	11 Jan 2010 16:41:50 -0000	1.1973
@@ -691,6 +691,7 @@ Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
+Patch1820: drm-intel-no-tv-hotplug.patch
 Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
@@ -1323,6 +1324,7 @@ ApplyPatch drm-nouveau.patch
 #ApplyPatch drm-radeon-pm.patch
 #ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
+ApplyPatch drm-intel-no-tv-hotplug.patch
 #ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
@@ -2005,6 +2007,10 @@ fi
 # and build.
 
 %changelog
+* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-13
+- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
+  2.6.31 (#522611, #544671)
+
 * Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-12
 - Re-enable ATM_HE (#545289)