diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-09-09 02:02:09 +0300 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-09 09:49:12 -0500 |
| commit | 3a83c16ef0e03e2ca2f1ce547a7cba53a62d0e0d (patch) | |
| tree | d3a9d1a68a4e6db7ae626a896f0dcd37f212300c /drivers/usb/gadget/function/uvc_v4l2.c | |
| parent | 7ea95b110811fa8e41f5960c278bcfc80b8b21c1 (diff) | |
| download | blackbird-op-linux-3a83c16ef0e03e2ca2f1ce547a7cba53a62d0e0d.tar.gz blackbird-op-linux-3a83c16ef0e03e2ca2f1ce547a7cba53a62d0e0d.zip | |
usb: gadget: uvc: separately compile some components of f_uvc
Compile uvc_queue, uvc_v4l2, uvc_video separately so that later they can
be all combined in a separately compiled f_uvc.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
[Make uvc_v4l2_ioctl_ops non-static]
[Rename __UVC__V4L2__H__ and __UVC__VIDEO__H__]
[Update MAINTAINERS]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/uvc_v4l2.c')
| -rw-r--r-- | drivers/usb/gadget/function/uvc_v4l2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index c85730eb36dd..b52f2681ec21 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -23,8 +23,10 @@ #include <media/v4l2-event.h> #include <media/v4l2-ioctl.h> +#include "f_uvc.h" #include "uvc.h" #include "uvc_queue.h" +#include "uvc_video.h" /* -------------------------------------------------------------------------- * Requests handling @@ -259,7 +261,7 @@ uvc_v4l2_ioctl_default(struct file *file, void *fh, bool valid_prio, } } -static const struct v4l2_ioctl_ops uvc_v4l2_ioctl_ops = { +const struct v4l2_ioctl_ops uvc_v4l2_ioctl_ops = { .vidioc_querycap = uvc_v4l2_querycap, .vidioc_g_fmt_vid_out = uvc_v4l2_get_format, .vidioc_s_fmt_vid_out = uvc_v4l2_set_format, @@ -350,7 +352,7 @@ static unsigned long uvc_v4l2_get_unmapped_area(struct file *file, } #endif -static struct v4l2_file_operations uvc_v4l2_fops = { +struct v4l2_file_operations uvc_v4l2_fops = { .owner = THIS_MODULE, .open = uvc_v4l2_open, .release = uvc_v4l2_release, |
