[Pkg-fglrx-devel] r411 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-05-20 19:48:44 +0000 (Thu, 20 May 2010)
New Revision: 411

Added:
   fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 06-build-with-2.6.34.diff to build against Linux 2.6.34.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-05-20 19:37:21 UTC (rev 410)
+++ fglrx-driver/trunk/debian/changelog	2010-05-20 19:48:44 UTC (rev 411)
@@ -7,8 +7,9 @@
   * Update to the new fglrx 10-4 release. AMD silently updated the original
     tarball. This patch adds support for new cards.
   * Speed up package building by adding --ignore options in debian/rules.
+  * Add patch 06-build-with-2.6.34.diff to build against Linux 2.6.34.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 20 May 2010 21:36:50 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 20 May 2010 21:48:05 +0200
 
 fglrx-driver (1:10-4-1) unstable; urgency=low
 

Added: fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff	2010-05-20 19:48:44 UTC (rev 411)
@@ -0,0 +1,13 @@
+# Experimental patch, to build with 2.6.34: untested!
+
+diff -Naur fglrx-driver-10-4.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c
+--- fglrx-driver-10-4.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-05-20 21:45:34.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-05-20 21:46:51.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
++#include <linux/slab.h>
+ 
+ #include "kcl_config.h"
+ #include "kcl_wait.h"

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-05-20 19:37:21 UTC (rev 410)
+++ fglrx-driver/trunk/debian/patches/series	2010-05-20 19:48:44 UTC (rev 411)
@@ -2,3 +2,4 @@
 02-add-new-cards.diff
 03-authatieventsd.sh.diff
 05_fix_cmpxchg.diff
+06-build-with-2.6.34.diff