Merge branch 'master' into can-usb1

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index a18939ffcf85262f0261228e0807a4883b80f521..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>