wok-6.x view catalyst/stuff/catalyst-2.6.36.patch @ rev 7957

Up: mlt-python-bindings to 0.6.0.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jan 15 17:23:12 2011 +0000 (2011-01-15)
parents
children
line source
1 --- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 21:51:48.000000000 +0200
2 +++ work/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 23:46:37.000000000 +0200
3 @@ -320,7 +320,11 @@
4 return firegl_release((KCL_IO_FILE_Handle)filp);
5 }
6
7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
8 +int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
9 +#else
10 int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
11 +#endif
12 {
13 return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
14 }
15 @@ -407,7 +411,11 @@
16 #endif
17 open: ip_firegl_open,
18 release: ip_firegl_release,
19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
20 + unlocked_ioctl: ip_firegl_ioctl,
21 +#else
22 ioctl: ip_firegl_ioctl,
23 +#endif
24 mmap: ip_firegl_mmap,
25
26 write: ip_firegl_write,