diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-01-21 18:24:59 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-01-21 18:24:59 +0000 |
| commit | 2f4b075cdd270f1ce53ce796d8328426e55326ad (patch) | |
| tree | c929e3ee28ac3a33f138cbf4f4bd12e8317ed55e | |
| parent | 613ed956297773445ac225da4d8129eb9df73b10 (diff) | |
If we have the accessors, do not under any circumstance redefine them
regardless of the kernel version.
Another followup to #14166 .
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5792 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi_dummy.c | 5 |
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; |