--- drivers/dahdi/Kbuild.hrtimer	2008-10-28 19:26:33.000000000 +0100
+++ drivers/dahdi/Kbuild	2009-01-12 17:17:18.481317989 +0100
@@ -56,6 +56,10 @@
 EXTRA_CFLAGS+=-Drw_lock_t=rwlock_t
 endif
 
+ifeq (1,$(shell fgrep -q ' hrtimer_set_expires' include/linux/hrtimer.h 2>/dev/null && echo 1))
+EXTRA_CFLAGS+=-DHAVE_HRTIMER_ACCESSORS=1
+endif
+
 dahdi-objs := dahdi-base.o
 
 dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o
--- drivers/dahdi/dahdi_dummy.c.hrtimer	2008-12-11 21:19:18.000000000 +0100
+++ drivers/dahdi/dahdi_dummy.c	2009-01-12 17:18:04.691317842 +0100
@@ -89,8 +89,8 @@
 #define USB2420
 #endif
 
-#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) )
-/* compatibility with new hrtimer interface */
+#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) ) || (! defined(HAVE_HRTIMER_ACCESSORS))
+/* Compatibility with new hrtimer interface */
 static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)
 {
 	return timer->expires;