summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 08:55:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 08:55:17 -0300
commit53cd728fba53912604889bec57b74645ac73365c (patch)
treea67d57b36c1db079ea9e1513092d80491ab2b899 /v4l
parent68a9ab040fc3603f2d5cf37f95bed2659afb320a (diff)
parent12612e9c32104136dbb8857ad481986555488245 (diff)
downloadmediapointer-dvb-s2-53cd728fba53912604889bec57b74645ac73365c.tar.gz
mediapointer-dvb-s2-53cd728fba53912604889bec57b74645ac73365c.tar.bz2
videodev2: Fix merge conflict
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.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index 5e46c8271..551696082 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -228,4 +228,11 @@ static inline struct proc_dir_entry *proc_create_data(const char *a,
typedef unsigned long uintptr_t;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+static inline int list_is_singular(const struct list_head *head)
+{
+ return !list_empty(head) && (head->next == head->prev);
+}
+#endif
+
#endif