summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-15 08:25:02 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-15 08:25:02 -0300
commite192b6f88d8065aacfce581bee2f3a231156e8be (patch)
treee987468be1c649162e0a10059900a682bb62824e /v4l
parent905787833253b4eaa26ebe72826447c814d339d8 (diff)
parent983506b534a01a91cadea8fd8369d6f00538cd0c (diff)
downloadmediapointer-dvb-s2-e192b6f88d8065aacfce581bee2f3a231156e8be.tar.gz
mediapointer-dvb-s2-e192b6f88d8065aacfce581bee2f3a231156e8be.tar.bz2
merge: http://linuxtv.org/hg/~anttip/anysee/
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.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index c480af095..b49572b4e 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -557,7 +557,11 @@ static inline struct proc_dir_entry *proc_create(const char *a,
}
return e;
}
+#endif
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#ifdef CONFIG_PROC_FS
static inline struct proc_dir_entry *proc_create_data(const char *a,
mode_t b, struct proc_dir_entry *c, const struct file_operations *d,
void *f)