aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-13 08:25:24 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 09:58:59 -0700
commit13bcd5d0e21e3ca726965371ada8ff6c64af288f (patch)
tree4303cab73cfe0534ebe7e749bfb4aa28f8a5f777 /include/media
parent2b8232ce512105e28453f301d1510de8363bccd1 (diff)
downloadkernel_samsung_aries-13bcd5d0e21e3ca726965371ada8ff6c64af288f.zip
kernel_samsung_aries-13bcd5d0e21e3ca726965371ada8ff6c64af288f.tar.gz
kernel_samsung_aries-13bcd5d0e21e3ca726965371ada8ff6c64af288f.tar.bz2
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 <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 9fa09fb..0fa5d59 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);