summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 12:57:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 12:57:00 -0300
commit8a8868a0bc72b42675b6bac8654c74823a612f90 (patch)
tree526a87d0328e4f0d4ea225cc3b8bc98660eee29e
parentd204fde57077927f62435f4ee1d1fcf1fb85f089 (diff)
parent047dfb0a62056f114245e9aee03b1cdc920ee209 (diff)
downloadmediapointer-dvb-s2-8a8868a0bc72b42675b6bac8654c74823a612f90.tar.gz
mediapointer-dvb-s2-8a8868a0bc72b42675b6bac8654c74823a612f90.tar.bz2
merge: http://linuxtv.org/hg/~dougsland/v4l-compat
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-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)