projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[cascardo/linux.git]
/
include
/
media
/
v4l2-fh.h
diff --git
a/include/media/v4l2-fh.h
b/include/media/v4l2-fh.h
index
528cdaf
..
8035167
100644
(file)
--- a/
include/media/v4l2-fh.h
+++ b/
include/media/v4l2-fh.h
@@
-45,6
+45,10
@@
struct v4l2_fh {
struct list_head available; /* Dequeueable event */
unsigned int navailable;
u32 sequence;
+
+#if IS_ENABLED(CONFIG_V4L2_MEM2MEM_DEV)
+ struct v4l2_m2m_ctx *m2m_ctx;
+#endif
};
/*