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 'v3.10.13' into lsk/v3.10/topic/kvm
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
platform
/
exynos-gsc
/
gsc-core.h
diff --git
a/drivers/media/platform/exynos-gsc/gsc-core.h
b/drivers/media/platform/exynos-gsc/gsc-core.h
index cc19bba09bd173720b2e8fc7b35813ea409da703..76435d3bf62d8a735c277c66724995ca78b8ab03 100644
(file)
--- a/
drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/
drivers/media/platform/exynos-gsc/gsc-core.h
@@
-343,6
+343,7
@@
struct gsc_dev {
unsigned long state;
struct vb2_alloc_ctx *alloc_ctx;
struct video_device vdev;
+ struct v4l2_device v4l2_dev;
};
/**