diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-01-21 05:39:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-25 19:50:49 -0300 |
| commit | 5a254d751e52e0f817090c29950d16cf18490d5b (patch) | |
| tree | 0f0d0076a6dbd478d3c0758bd339a93a6970bfee /drivers/media/video/uvc/uvcvideo.h | |
| parent | 115d2535f8ced13503b62a1275338e09a51681dc (diff) | |
| download | talos-op-linux-5a254d751e52e0f817090c29950d16cf18490d5b.tar.gz talos-op-linux-5a254d751e52e0f817090c29950d16cf18490d5b.zip | |
[media] uvcvideo: Register a v4l2_device
As a first step to the media controller integration register a
v4l2_device for each UVC control interface and make the video_device a
child of the v4l2_device.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 7cf224bae2e5..aab7508f2bd2 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h @@ -100,6 +100,8 @@ struct uvc_xu_control { #include <linux/poll.h> #include <linux/usb/video.h> #include <linux/uvcvideo.h> +#include <media/media-device.h> +#include <media/v4l2-device.h> /* -------------------------------------------------------------------------- * UVC constants @@ -504,6 +506,10 @@ struct uvc_device { atomic_t nmappings; /* Video control interface */ +#ifdef CONFIG_MEDIA_CONTROLLER + struct media_device mdev; +#endif + struct v4l2_device vdev; __u16 uvc_version; __u32 clock_frequency; |
