linamh/app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff

24 lines
953 B
Diff

Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2010-12-17
Initial Package Version: 0.4.3rc2
Origin: me
Upstream Status: unknown
Description: make it compile with 2.6.36
diff -Naur opencbm-0.4.3rc2.orig/sys/linux/.cbm_module.o.d opencbm-0.4.3rc2/sys/linux/.cbm_module.o.d
diff -Naur opencbm-0.4.3rc2.orig/sys/linux/cbm_module.c opencbm-0.4.3rc2/sys/linux/cbm_module.c
--- opencbm-0.4.3rc2.orig/sys/linux/cbm_module.c 2010-12-17 19:10:28.000000000 +0000
+++ opencbm-0.4.3rc2/sys/linux/cbm_module.c 2010-12-17 19:12:33.000000000 +0000
@@ -924,7 +924,11 @@
#endif
.read = cbm_read, /* read */
.write = cbm_write, /* write */
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36))
.ioctl = cbm_ioctl, /* ioctl */
+# else
+ .unlocked_ioctl = cbm_ioctl, /* ioctl */
+# endif
.open = cbm_open, /* open */
.release = cbm_release, /* release */
};