[dahdi-commits] tzafrir: linux/trunk r5778 - in /linux/trunk/drivers/dahdi: Kbuild dahdi_dummy.c

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Wed Jan 21 09:17:20 2009
New Revision: 5778

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=5778
Log:
Fix version in dahdi_dummy workaround. 

Followup to #14166 .

Also note that this is specific to some Fedora versions.
See e.g.
http://cvs.fedoraproject.org/viewvc/rpms/kernel/F-10/kernel.spec?r1=1.1206.2.2&r2=1.1206.2.3

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

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=5778&r1=5777&r2=5778
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Wed Jan 21 09:17:20 2009
@@ -56,6 +56,8 @@
 EXTRA_CFLAGS+=-Drw_lock_t=rwlock_t
 endif
 
+# A number of Fedora 10 (9 also?) kernels backported hrtimer to 2.6.27
+# as part of an ALSA backport. TODO: Any better way to detect that?
 ifeq (1,$(shell fgrep -q ' hrtimer_set_expires' include/linux/hrtimer.h 2>/dev/null && echo 1))
 EXTRA_CFLAGS+=-DHAVE_HRTIMER_ACCESSORS=1
 endif

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=5778&r1=5777&r2=5778
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dummy.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dummy.c Wed Jan 21 09:17:20 2009
@@ -90,7 +90,7 @@
 #endif
 
 #if defined(USE_HIGHRESTIMER) && \
-	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)) || \
+	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)) || \
 	(!defined(HAVE_HRTIMER_ACCESSORS))
 /* Compatibility with new hrtimer interface */
 static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)