From 13bcd5d0e21e3ca726965371ada8ff6c64af288f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 13 Oct 2007 08:25:24 +0100 Subject: 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. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- include/media/videobuf-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/media/videobuf-core.h') diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 9fa09fb800a1..0fa5d5912555 100644 --- a/include/media/videobuf-core.h +++ b/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_to_user) (struct videobuf_queue *q, + int (*video_copy_to_user)(struct videobuf_queue *q, char __user *data, size_t count, int nonblocking); -- cgit v1.2.3-59-g8ed1b