rpms/kernel/F-11 drm-nouveau.patch, 1.40, 1.41 kernel.spec, 1.1556, 1.1557

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95
- nouveau: fix powerpc build


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- drm-nouveau.patch	17 Apr 2009 11:34:52 -0000	1.40
+++ drm-nouveau.patch	17 Apr 2009 12:25:32 -0000	1.41
@@ -7791,8 +7791,8 @@
 +
 +/* channel control reg access */
 +#if defined(__powerpc__)
-+#define nvchan_wr32(reg,val) out_be32((void __iomem *)chan->user->handle, (reg), (val))
-+#define nvchan_rd32(reg) in_be32((void __iomem *)chan->user->handle, (reg))
++#define nvchan_wr32(reg,val) out_be32((void __iomem *)chan->user->handle + (reg), (val))
++#define nvchan_rd32(reg) in_be32((void __iomem *)chan->user->handle + (reg))
 +#else
 +#define nvchan_wr32(reg,val) DRM_WRITE32(chan->user, (reg), (val))
 +#define nvchan_rd32(reg) DRM_READ32(chan->user, (reg))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1556
retrieving revision 1.1557
diff -u -r1.1556 -r1.1557
--- kernel.spec	17 Apr 2009 11:07:15 -0000	1.1556
+++ kernel.spec	17 Apr 2009 12:25:32 -0000	1.1557
@@ -1969,6 +1969,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-95
+- nouveau: fix powerpc build
+
 * Fri Apr 17 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-94
 - drm-next.patch: backport fix to drm-next