rpms/kernel/devel drm-nouveau.patch, 1.5, 1.6 kernel.spec, 1.1243, 1.1244

Kyle McMartin kyle at fedoraproject.org
Wed Jan 28 21:33:12 UTC 2009


Author: kyle

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- drm-nouveau.patch: /me sighs in the general direction of ppc.


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drm-nouveau.patch	28 Jan 2009 17:51:51 -0000	1.5
+++ drm-nouveau.patch	28 Jan 2009 21:33:11 -0000	1.6
@@ -5950,10 +5950,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..150438e
+index 0000000..3412e14
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,866 @@
+@@ -0,0 +1,868 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -5979,6 +5979,8 @@
 + * DEALINGS IN THE SOFTWARE.
 + */
 +
++#include <linux/swab.h>
++
 +#include "drmP.h"
 +#include "drm.h"
 +#include "drm_sarea.h"
@@ -6440,7 +6442,7 @@
 +	reg1 = readl(regs+NV03_PMC_BOOT_1);
 +#if defined(__powerpc__)
 +	if (reg1)
-+		reg0=___fswab32(reg0);
++		reg0=swab32(reg0);
 +#endif
 +
 +	/* We're dealing with >=NV10 */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1243
retrieving revision 1.1244
diff -u -r1.1243 -r1.1244
--- kernel.spec	28 Jan 2009 20:06:23 -0000	1.1243
+++ kernel.spec	28 Jan 2009 21:33:11 -0000	1.1244
@@ -1779,6 +1779,9 @@
 
 %changelog
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- drm-nouveau.patch: /me sighs in the general direction of ppc.
+
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - sata_sil-build-break-fix.patch: fix use of DMI.
 
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>




More information about the fedora-extras-commits mailing list