From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 9 Apr 2010 09:08:32 +0000 (+0200)
Subject: Merge branch 'master' into can-usb1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a7089a3bc04cfa7e263670d51f5af9abb0791ea8?hp=-c

Merge branch 'master' into can-usb1
---

a7089a3bc04cfa7e263670d51f5af9abb0791ea8
diff --combined lincan/include/can_sysdep.h
index a18939f,7248249..ff06946
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@@ -55,6 -55,7 +55,7 @@@
  #include <linux/delay.h>
  #include <linux/sched.h>
  #include <linux/interrupt.h>
+ #include <linux/time.h>
  #include <asm/errno.h>
  
  #include <asm/io.h>
@@@ -291,20 -292,4 +292,20 @@@ extern can_spinlock_t can_irq_manipulat
  
  #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*/