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

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-10-31 09:24:05 +0000 (Sun, 31 Oct 2010)
New Revision: 494

Added:
   fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 04-2.6.36-support.diff from Bal?\195?\161zs H?\195?\161morszky for adding Linux
  2.6.36 support.
  Closes: #598654


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-10-24 11:13:09 UTC (rev 493)
+++ fglrx-driver/trunk/debian/changelog	2010-10-31 09:24:05 UTC (rev 494)
@@ -2,8 +2,11 @@
 
   * New upstream release.
     - Remove merged patch 04-dkms-compat_alloc_user_space-rename.
+  * Add patch 04-2.6.36-support.diff from Balázs Hámorszky for adding Linux
+    2.6.36 support.
+    Closes: #598654
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 24 Oct 2010 13:07:38 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 31 Oct 2010 10:22:10 +0100
 
 fglrx-driver (1:10-9-3) unstable; urgency=high
 

Added: fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff	2010-10-31 09:24:05 UTC (rev 494)
@@ -0,0 +1,30 @@
+# This patch from Balázs Hámorszky adds Linux 2.6.36 support.
+# Closes: #598654
+
+diff -Naur fglrx-driver-10-10.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-10//common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-10-10.orig//common/lib/modules/fglrx/build_mod/firegl_public.c	2010-10-19 23:41:18.000000000 +0200
++++ fglrx-driver-10-10//common/lib/modules/fglrx/build_mod/firegl_public.c	2010-10-31 10:18:28.000000000 +0100
+@@ -320,7 +320,11 @@
+     return firegl_release((KCL_IO_FILE_Handle)filp);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
++#else
+ int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
++#endif
+ {
+     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
+ }
+@@ -407,7 +411,11 @@
+ #endif
+     open:    ip_firegl_open,
+     release: ip_firegl_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++    unlocked_ioctl:   ip_firegl_ioctl,
++#else
+     ioctl:   ip_firegl_ioctl,
++#endif
+     mmap:    ip_firegl_mmap,
+ 
+     write:   ip_firegl_write,

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-10-24 11:13:09 UTC (rev 493)
+++ fglrx-driver/trunk/debian/patches/series	2010-10-31 09:24:05 UTC (rev 494)
@@ -1,2 +1,3 @@
 01-CONFIG_X86_XEN.diff
 03-authatieventsd.sh.diff
+04-2.6.36-support.diff