diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-22 10:26:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-22 10:26:10 +0200 |
| commit | b24d6f49122d9da8202d751ac7e66fe8136bb434 (patch) | |
| tree | b54cdf17c2a6d7a718733aa2e72fe26eb14927f7 /drivers/usb/gadget/uvc.h | |
| parent | cedce3e730833d26a37826a96e1905b6ef387df9 (diff) | |
| parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) | |
| download | linux-next-b24d6f49122d9da8202d751ac7e66fe8136bb434.tar.gz | |
Merge tag 'v3.11-rc2' into sched/core
Merge in Linux 3.11-rc2, to provide a post-merge-window development base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 817e9e19cecf..7a9111de8054 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; |