diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-01-21 15:17:20 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-01-21 15:17:20 +0000 |
| commit | 9b8c4f9965b097601a256452e5fe6dc6f9bdc8ad (patch) | |
| tree | 2aa5cb8acb948edc8b71d9d6f5b8cad56ae3f92b | |
| parent | 71ba0631e3f0d50c1b3e19c6282fe362a5d63ee7 (diff) | |
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
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5778 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/Kbuild | 2 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_dummy.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 6e3f7a1..c62de64 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -56,6 +56,8 @@ ifneq (,$(filter $(KVERS),$(BAD_KERNELS))) 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 diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index a009ac2..90172e3 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -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) |