summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-17 12:50:37 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-17 12:50:37 -0200
commit1415aa86ba618cd78412ef6af03ad06d5d1547c9 (patch)
tree51db2d05ab4f070ebcbbe293a5ff1c9844e3fda7 /linux/include
parentb697a8c436b9b9251711908b3da7aed6cb984460 (diff)
downloadmediapointer-dvb-s2-1415aa86ba618cd78412ef6af03ad06d5d1547c9.tar.gz
mediapointer-dvb-s2-1415aa86ba618cd78412ef6af03ad06d5d1547c9.tar.bz2
backport changeset 13bcd5d0e21e3ca726965371ada8ff6c64af288f
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: Author: Al Viro <viro@ftp.linux.org.uk> Date: Sat Oct 13 08:25:24 2007 +0100 v4l: copy_to_user() is not a good method name Breaks on any target that has copy_to_user() defined as a non-trivial macro. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/videobuf-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h
index 7c30f39ca..4359823c3 100644
--- a/linux/include/media/videobuf-core.h
+++ b/linux/include/media/videobuf-core.h
@@ -133,7 +133,7 @@ struct videobuf_qtype_ops {
enum v4l2_memory memory);
int (*sync) (struct videobuf_queue* q,
struct videobuf_buffer *buf);
- int (*copy_user) (struct videobuf_queue *q,
+ int (*video_copy_to_user)(struct videobuf_queue *q,
char __user *data,
size_t count,
int nonblocking);