Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index a2a82180431e8523612f7a240bd639132545389b..b2c8d83e3d5ce0ff54c2d1ad7d58dca944038c01 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -56,6 +56,9 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/time.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+       #include <linux/kref.h>
+#endif
 #include <asm/errno.h>
 
 #include <asm/io.h>
@@ -133,13 +136,13 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,7)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 
-#define MINOR_NR \
-       (MINOR(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (MINOR(inode->i_rdev))
 
 #else /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
-#define MINOR_NR \
-       (minor(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (minor(inode->i_rdev))
 
 #endif /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
@@ -304,4 +307,20 @@ extern can_spinlock_t can_irq_manipulation_lock;
 
 #endif /*CAN_WITH_RTL*/
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4))
+       #include <linux/kthread.h>
+       #define can_kthread_create      kthread_create
+       #define can_kthread_run kthread_run
+       #define can_kthread_bind        kthread_bind
+       #define can_kthread_stop        kthread_stop
+       #define can_kthread_should_stop kthread_should_stop
+#else
+       #define can_kthread_create
+       #define can_kthread_run
+       #define can_kthread_bind
+       #define can_kthread_stop
+       #define can_kthread_should_stop
+#endif
+
+
 #endif /*_CAN_SYSDEP_H*/