rpms/kernel/devel drm-intel-pm.patch,1.2,1.3

[Matthew Garrett]

Author: mjg59

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

Modified Files:
	drm-intel-pm.patch 
Log Message:
Remove cruft to make Kyle happy


drm-intel-pm.patch:
 i915_drv.c      |   15 +
 i915_drv.h      |   14 +
 i915_gem.c      |    8 
 i915_reg.h      |   22 ++
 intel_display.c |  483 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 intel_drv.h     |    4 
 6 files changed, 511 insertions(+), 35 deletions(-)

Index: drm-intel-pm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-pm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-intel-pm.patch	30 Jul 2009 20:43:31 -0000	1.2
+++ drm-intel-pm.patch	30 Jul 2009 21:01:40 -0000	1.3
@@ -61,7 +61,6 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
  
  #endif
-Only in linux-2.6.30.noarch.orig/drivers/gpu/drm/i915: i915_drv.h.orig
 diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_gem.c linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c
 --- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_gem.c	2009-07-30 21:32:05.000000000 +0100
 +++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c	2009-07-30 21:29:34.000000000 +0100
@@ -149,7 +148,6 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define PIPEASTAT		0x70024
  #define   PIPE_FIFO_UNDERRUN_STATUS		(1UL<<31)
  #define   PIPE_CRC_ERROR_ENABLE			(1UL<<29)
-Only in linux-2.6.30.noarch.orig/drivers/gpu/drm/i915: i915_reg.h.orig
 diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_display.c linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
 --- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_display.c	2009-07-30 21:32:05.000000000 +0100
 +++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-07-30 21:29:34.000000000 +0100
@@ -899,7 +897,6 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	drm_mode_config_cleanup(dev);
  }
  
-Only in linux-2.6.30.noarch.orig/drivers/gpu/drm/i915: intel_display.c.orig
 diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_drv.h linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
 --- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_drv.h	2009-07-30 21:32:05.000000000 +0100
 +++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-07-30 21:29:34.000000000 +0100