rpms/kernel/devel drm-nouveau.patch, 1.32, 1.33 kernel.spec, 1.1595, 1.1596

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Sat Jun 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.33.rc1.git2
- drm-nouveau.patch: fix conflicts from 2.6.31-rc1-git2



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- drm-nouveau.patch	26 Jun 2009 10:24:18 -0000	1.32
+++ drm-nouveau.patch	27 Jun 2009 02:28:30 -0000	1.33
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index c961fe4..ae0c108 100644
+index 39b393d..3339338 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -142,3 +142,22 @@ config DRM_SAVAGE
+@@ -143,3 +143,22 @@ config DRM_SAVAGE
  	help
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
@@ -26,16 +26,14 @@ index c961fe4..ae0c108 100644
 +	userspaces with this enabled will cause pain.
 +
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 4e89ab0..5687c02 100644
+index fe23f29..4c6a38d 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -26,4 +26,6 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -27,3 +27,4 @@ obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
-+
- obj-$(CONFIG_DRM_TTM)	+= ttm/
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
 index 6246e3f..436e2fe 100644
 --- a/drivers/gpu/drm/drm_bufs.c


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1595
retrieving revision 1.1596
diff -u -p -r1.1595 -r1.1596
--- kernel.spec	26 Jun 2009 14:41:59 -0000	1.1595
+++ kernel.spec	27 Jun 2009 02:28:30 -0000	1.1596
@@ -1225,7 +1225,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 #ApplyPatch drm-modesetting-radeon.patch
-#ApplyPatch drm-nouveau.patch
+ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
@@ -1846,6 +1846,9 @@ fi
 # and build.
 
 %changelog
+* Sat Jun 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.33.rc1.git2
+- drm-nouveau.patch: fix conflicts from 2.6.31-rc1-git2
+
 * Fri Jun 26 2009 Dave Jones <davej at redhat.com> 2.6.31-0.31.rc1.git2
 - Further improvements to kmemleak