summaryrefslogtreecommitdiff
path: root/drivers/dahdi/dahdi_dummy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dahdi/dahdi_dummy.c')
-rw-r--r--drivers/dahdi/dahdi_dummy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c
index 90172e3..f084061 100644
--- a/drivers/dahdi/dahdi_dummy.c
+++ b/drivers/dahdi/dahdi_dummy.c
@@ -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)
{
@@ -103,6 +103,7 @@ static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
timer->expires = time;
}
#endif
+#endif
struct dahdi_dummy {
struct dahdi_span span;