diff options
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 1 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 533c47f50..64918029f 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -110,7 +110,6 @@ struct video_device char name[32]; int type; /* v4l1 */ int type2; /* v4l2 */ - int hardware; int minor; int debug; /* Activates debug level*/ diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index 43b4d5138..7c30f39ca 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_to_user) (struct videobuf_queue *q, + int (*copy_user) (struct videobuf_queue *q, char __user *data, size_t count, int nonblocking); |