4 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index c606332512b6..5599a36490fc 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -674,7 +674,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
         }
 
         /* Copy to userspace */
-        retval=CALL(q,copy_to_user,q,data,count,nonblocking);
+        retval=CALL(q,video_copy_to_user,q,data,count,nonblocking);
         if (retval<0)
                 goto done;
 
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 8bb7fdd306d6..3eb6123227b2 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -670,7 +670,7 @@ static struct videobuf_qtype_ops pci_ops = {
         .sync         = __videobuf_sync,
         .mmap_free    = __videobuf_mmap_free,
         .mmap_mapper  = __videobuf_mmap_mapper,
-        .copy_to_user = __videobuf_copy_to_user,
+        .video_copy_to_user = __videobuf_copy_to_user,
         .copy_stream  = __videobuf_copy_stream,
 };
 
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 2e3689a12a28..cd74341c984f 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -320,7 +320,7 @@ static struct videobuf_qtype_ops qops = {
         .sync         = __videobuf_sync,
         .mmap_free    = __videobuf_mmap_free,
         .mmap_mapper  = __videobuf_mmap_mapper,
-        .copy_to_user = __videobuf_copy_to_user,
+        .video_copy_to_user = __videobuf_copy_to_user,
         .copy_stream  = __videobuf_copy_stream,
 };
 
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);