wok annotate catalyst/stuff/catalyst-2.6.36.patch @ rev 7158
Added talloc to mesa depends. Added talloc-dev to mesa-demos build depends.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sat Nov 06 22:41:17 2010 +0000 (2010-11-06) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@7134 | 1 --- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 21:51:48.000000000 +0200 |
| slaxemulator@7134 | 2 +++ work/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 23:46:37.000000000 +0200 |
| slaxemulator@7134 | 3 @@ -320,7 +320,11 @@ |
| slaxemulator@7134 | 4 return firegl_release((KCL_IO_FILE_Handle)filp); |
| slaxemulator@7134 | 5 } |
| slaxemulator@7134 | 6 |
| slaxemulator@7134 | 7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) |
| slaxemulator@7134 | 8 +int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg) |
| slaxemulator@7134 | 9 +#else |
| slaxemulator@7134 | 10 int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg) |
| slaxemulator@7134 | 11 +#endif |
| slaxemulator@7134 | 12 { |
| slaxemulator@7134 | 13 return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg); |
| slaxemulator@7134 | 14 } |
| slaxemulator@7134 | 15 @@ -407,7 +411,11 @@ |
| slaxemulator@7134 | 16 #endif |
| slaxemulator@7134 | 17 open: ip_firegl_open, |
| slaxemulator@7134 | 18 release: ip_firegl_release, |
| slaxemulator@7134 | 19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) |
| slaxemulator@7134 | 20 + unlocked_ioctl: ip_firegl_ioctl, |
| slaxemulator@7134 | 21 +#else |
| slaxemulator@7134 | 22 ioctl: ip_firegl_ioctl, |
| slaxemulator@7134 | 23 +#endif |
| slaxemulator@7134 | 24 mmap: ip_firegl_mmap, |
| slaxemulator@7134 | 25 |
| slaxemulator@7134 | 26 write: ip_firegl_write, |