diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-12 06:02:38 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 11:04:47 -0300 |
commit | b60f9aa1a9fcf69df963c1f06ee0594d836f6760 (patch) | |
tree | 1a3b86d5fae708a3572d42cd38b06f39cb18d3f3 /drivers/usb/gadget/uvc.h | |
parent | a28fbd04facbffe9374f25c3a19c54ce4f186361 (diff) | |
download | op-kernel-dev-b60f9aa1a9fcf69df963c1f06ee0594d836f6760.zip op-kernel-dev-b60f9aa1a9fcf69df963c1f06ee0594d836f6760.tar.gz |
[media] f_uvc: add v4l2_device and replace parent with v4l2_dev
This driver did not yet support struct v4l2_device, so add it. This
make it possible to replace the deprecated parent field with the
v4l2_dev field, allowing the eventual removal of the parent field.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/usb/gadget/uvc.h')
-rw-r--r-- | drivers/usb/gadget/uvc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h index 817e9e1..7a9111d 100644 --- a/drivers/usb/gadget/uvc.h +++ b/drivers/usb/gadget/uvc.h @@ -57,6 +57,7 @@ struct uvc_event #include <linux/videodev2.h> #include <linux/version.h> #include <media/v4l2-fh.h> +#include <media/v4l2-device.h> #include "uvc_queue.h" @@ -145,6 +146,7 @@ enum uvc_state struct uvc_device { struct video_device *vdev; + struct v4l2_device v4l2_dev; enum uvc_state state; struct usb_function func; struct uvc_video video; |