summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc/uvcvideo.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-09-30 10:17:54 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-25 08:35:02 -0200
commitd5e90b7a6cd1ce9512f8a2c9b1be70155300d2da (patch)
tree5ed649d0bb9990e5b48cd6b4e3c83caf63c0d802 /drivers/media/usb/uvc/uvcvideo.h
parent59b702ea9f4467bf6b6281d5d21cebfc1fa11e8d (diff)
downloadlinux-d5e90b7a6cd1ce9512f8a2c9b1be70155300d2da.tar.gz
linux-d5e90b7a6cd1ce9512f8a2c9b1be70155300d2da.tar.bz2
linux-d5e90b7a6cd1ce9512f8a2c9b1be70155300d2da.zip
[media] uvcvideo: Move to video_ioctl2
Simplify ioctl handling by using video_ioctl2. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvcvideo.h')
-rw-r--r--drivers/media/usb/uvc/uvcvideo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 2600c9667a64..53db7ed1e472 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -580,7 +580,6 @@ struct uvc_driver {
#define UVC_TRACE_FORMAT (1 << 3)
#define UVC_TRACE_CAPTURE (1 << 4)
#define UVC_TRACE_CALLS (1 << 5)
-#define UVC_TRACE_IOCTL (1 << 6)
#define UVC_TRACE_FRAME (1 << 7)
#define UVC_TRACE_SUSPEND (1 << 8)
#define UVC_TRACE_STATUS (1 << 9)
@@ -654,6 +653,7 @@ static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
}
/* V4L2 interface */
+extern const struct v4l2_ioctl_ops uvc_ioctl_ops;
extern const struct v4l2_file_operations uvc_fops;
/* Media controller */