From: David Schleef Date: Thu, 6 Oct 2005 17:47:00 +0000 (+0000) Subject: copy from 0.7 branch X-Git-Tag: r0_7_71~141 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=40aec74a7a2afa1073f37890ad5ea1f5d4bbe3c5;p=comedi.git copy from 0.7 branch --- diff --git a/include/linux/time.h b/include/linux/time.h index 48345ccf..fccbff54 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -6,7 +6,7 @@ #include_next -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,29) || ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7) ) static inline unsigned int jiffies_to_msecs(const unsigned long j) {