copy from 0.7 branch

diff --git a/include/linux/time.h b/include/linux/time.h
index 48345ccf0fe822924a23bcfb466db0aebe373b0e..fccbff54b2139f6c9ca026da4e8a8ecd7d306ce4 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -6,7 +6,7 @@
 
 #include_next <linux/time.h>
 
-#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)
 {