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 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
platform
/
davinci
/
vpif_display.h
diff --git
a/drivers/media/platform/davinci/vpif_display.h
b/drivers/media/platform/davinci/vpif_display.h
index 849e0e385f182f0c1324e19c1d44b15b2024327d..e7a1723a1b7ab384fe745b8c7a237b6121321c1d 100644
(file)
--- a/
drivers/media/platform/davinci/vpif_display.h
+++ b/
drivers/media/platform/davinci/vpif_display.h
@@
-62,7
+62,7
@@
struct video_obj {
};
struct vpif_disp_buffer {
- struct vb2_buffer vb;
+ struct vb2_
v4l2_
buffer vb;
struct list_head list;
};