diff options
Diffstat (limited to 'drivers')
| -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) |