projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[linux-2.6-block.git]
/
include
/
media
/
v4l2-dev.h
diff --git
a/include/media/v4l2-dev.h
b/include/media/v4l2-dev.h
index eeabf20e87a66d5c4306e059c15d277d17cea9a7..76056ab5c5bde3da22b13f371e77a0ab57eef197 100644
(file)
--- a/
include/media/v4l2-dev.h
+++ b/
include/media/v4l2-dev.h
@@
-87,6
+87,7
@@
struct video_device
#if defined(CONFIG_MEDIA_CONTROLLER)
struct media_entity entity;
struct media_intf_devnode *intf_devnode;
+ struct media_pipeline pipe;
#endif
/* device ops */
const struct v4l2_file_operations *fops;