wok diff catalyst/stuff/catalyst-2.6.36.patch @ rev 7809

Up slitaz-tools (3.9.3)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Dec 24 19:01:39 2010 +0100 (2010-12-24)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/catalyst/stuff/catalyst-2.6.36.patch	Fri Dec 24 19:01:39 2010 +0100
     1.3 @@ -0,0 +1,26 @@
     1.4 +--- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
     1.5 ++++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
     1.6 +@@ -320,7 +320,11 @@
     1.7 +     return firegl_release((KCL_IO_FILE_Handle)filp);
     1.8 + }
     1.9 +
    1.10 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    1.11 ++int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
    1.12 ++#else
    1.13 + int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
    1.14 ++#endif
    1.15 + {
    1.16 +     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
    1.17 + }
    1.18 +@@ -407,7 +411,11 @@
    1.19 + #endif
    1.20 +     open:    ip_firegl_open,
    1.21 +     release: ip_firegl_release,
    1.22 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    1.23 ++    unlocked_ioctl:   ip_firegl_ioctl,
    1.24 ++#else
    1.25 +     ioctl:   ip_firegl_ioctl,
    1.26 ++#endif
    1.27 +     mmap:    ip_firegl_mmap,
    1.28 +
    1.29 +     write:   ip_firegl_write,
    1.30 \ No newline at end of file