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 60f8f129a4114b958067ff4df161eba7967b2a60..ff0694611516430bcc40890ae190cc960855b2d1 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -55,6 +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>
@@ -213,6 +214,9 @@
 
 #ifdef __HAVE_ARCH_CMPXCHG
   #define CAN_HAVE_ARCH_CMPXCHG
+  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+    #define CAN_HAVE_ATOMIC_CMPXCHG
+  #endif
 #endif
 
 #ifndef CAN_WITH_RTL