rpms/kernel/devel config-generic, 1.238.6.24, 1.238.6.25 kernel.spec, 1.1294.2.34, 1.1294.2.35

[myoung]

Author: myoung

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

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic kernel.spec 
Log Message:
pvops has compile problems with CONFIG_DRM_RADEON_KMS and CONFIG_DRM_NOUVEAU so disable them



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.24
retrieving revision 1.238.6.25
diff -u -p -r1.238.6.24 -r1.238.6.25
--- config-generic	27 Jun 2009 11:05:09 -0000	1.238.6.24
+++ config-generic	27 Jun 2009 12:42:28 -0000	1.238.6.25
@@ -2233,7 +2233,7 @@ CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
@@ -2242,7 +2242,7 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
-CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NOUVEAU_KMS is not set
 
 #


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.34
retrieving revision 1.1294.2.35
diff -u -p -r1.1294.2.34 -r1.1294.2.35
--- kernel.spec	27 Jun 2009 11:05:14 -0000	1.1294.2.34
+++ kernel.spec	27 Jun 2009 12:42:28 -0000	1.1294.2.35
@@ -1856,6 +1856,10 @@ fi
 * Sat Jun 27 2009 Michael Young <m.a.young at durham.ac.uk>
 - switch pvops to xen/rebase/master branch
 - rebase pvops on 2.6.31-rc1-git2
+- drivers/gpu/drm/ttm/ttm_agp_backend.c doesn't like 
+  include/linux/swiotlb.h so disable the options CONFIG_DRM_RADEON_KMS
+  and CONFIG_DRM_NOUVEAU that use it.
+
 
 * 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