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/legacy | |
| parent | 7ea95b110811fa8e41f5960c278bcfc80b8b21c1 (diff) | |
| download | op-kernel-dev-3a83c16ef0e03e2ca2f1ce547a7cba53a62d0e0d.zip op-kernel-dev-3a83c16ef0e03e2ca2f1ce547a7cba53a62d0e0d.tar.gz | |
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/legacy')
| -rw-r--r-- | drivers/usb/gadget/legacy/Makefile | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/legacy/webcam.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile index 7f485f2..ed7367e 100644 --- a/drivers/usb/gadget/legacy/Makefile +++ b/drivers/usb/gadget/legacy/Makefile @@ -19,7 +19,7 @@ g_multi-y := multi.o g_hid-y := hid.o g_dbgp-y := dbgp.o g_nokia-y := nokia.o -g_webcam-y := webcam.o +g_webcam-y := webcam.o ../function/uvc_queue.o ../function/uvc_v4l2.o ../function/uvc_video.o g_ncm-y := ncm.o g_acm_ms-y := acm_ms.o g_tcm_usb_gadget-y := tcm_usb_gadget.o diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c index f826622..5d02849 100644 --- a/drivers/usb/gadget/legacy/webcam.c +++ b/drivers/usb/gadget/legacy/webcam.c @@ -12,10 +12,9 @@ #include <linux/kernel.h> #include <linux/device.h> +#include <linux/module.h> #include <linux/usb/video.h> -#include "f_uvc.h" - /* * Kbuild is not very cooperative with respect to linking separately * compiled library objects into one module. So for now we won't use @@ -23,9 +22,6 @@ * the runtime footprint, and giving us at least some parts of what * a "gcc --combine ... part1.c part2.c part3.c ... " build would. */ -#include "uvc_queue.c" -#include "uvc_video.c" -#include "uvc_v4l2.c" #include "f_uvc.c" USB_GADGET_COMPOSITE_OPTIONS(); |
