[dahdi-commits] sruffell: linux/trunk r5792 - /linux/trunk/drivers/dahdi/dahdi_dummy.c

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Jan 21 12:24:59 2009
New Revision: 5792

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=5792
Log:
If we have the accessors, do not under any circumstance redefine them
regardless of the kernel version.

Another followup to #14166 .

Modified:
    linux/trunk/drivers/dahdi/dahdi_dummy.c

Modified: linux/trunk/drivers/dahdi/dahdi_dummy.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/dahdi_dummy.c?view=diff&rev=5792&r1=5791&r2=5792
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dummy.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dummy.c Wed Jan 21 12:24:59 2009
@@ -89,9 +89,9 @@
 #define USB2420
 #endif
 
+#ifndef HAVE_HRTIMER_ACCESSORS
 #if defined(USE_HIGHRESTIMER) && \
-	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)) || \
-	(!defined(HAVE_HRTIMER_ACCESSORS))
+	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28))
 /* Compatibility with new hrtimer interface */
 static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)
 {
@@ -102,6 +102,7 @@
 {
 	timer->expires = time;
 }
+#endif
 #endif
 
 struct dahdi_dummy {