summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 13:00:56 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 13:00:56 -0300
commit85cb8b761dd5b3347aaa0fb22882bbd08525d860 (patch)
tree9e9e92e4663a7c5be6a2c1d67c4b7119d7145a61 /v4l
parent0c023f377be69bb35de1be41cebf647704ac9f94 (diff)
parent8a8868a0bc72b42675b6bac8654c74823a612f90 (diff)
downloadmediapointer-dvb-s2-85cb8b761dd5b3347aaa0fb22882bbd08525d860.tar.gz
mediapointer-dvb-s2-85cb8b761dd5b3347aaa0fb22882bbd08525d860.tar.bz2
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/compat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index 581262bdf..0352fcd39 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -20,7 +20,8 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-# define set_freezable()
+#define set_freezable()
+#define cancel_delayed_work_sync cancel_rearming_delayed_work
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)