projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
gadget
/
function
/
uvc_queue.h
diff --git
a/drivers/usb/gadget/function/uvc_queue.h
b/drivers/usb/gadget/function/uvc_queue.h
index 01ca9eab3481d4550f3d2a1fc99eafd547327a5c..ac461a9a1a70661da55e5f8a01b7fbde6caaf826 100644
(file)
--- a/
drivers/usb/gadget/function/uvc_queue.h
+++ b/
drivers/usb/gadget/function/uvc_queue.h
@@
-6,7
+6,7
@@
#include <linux/kernel.h>
#include <linux/poll.h>
#include <linux/videodev2.h>
#include <linux/kernel.h>
#include <linux/poll.h>
#include <linux/videodev2.h>
-#include <media/videobuf2-
core
.h>
+#include <media/videobuf2-
v4l2
.h>
/* Maximum frame size in bytes, for sanity checking. */
#define UVC_MAX_FRAME_SIZE (16*1024*1024)
/* Maximum frame size in bytes, for sanity checking. */
#define UVC_MAX_FRAME_SIZE (16*1024*1024)
@@
-26,7
+26,7
@@
enum uvc_buffer_state {
};
struct uvc_buffer {
};
struct uvc_buffer {
- struct vb2_buffer buf;
+ struct vb2_
v4l2_
buffer buf;
struct list_head queue;
enum uvc_buffer_state state;
struct list_head queue;
enum uvc_buffer_state state;