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 branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
include
/
video
/
imx-ipu-v3.h
diff --git
a/include/video/imx-ipu-v3.h
b/include/video/imx-ipu-v3.h
index eeba75395f7d10b61fabf995d2b0157aec6d9ee5..c8529ce28a3f540eb69bf1e0182c1f5e45b74249 100644
(file)
--- a/
include/video/imx-ipu-v3.h
+++ b/
include/video/imx-ipu-v3.h
@@
-16,6
+16,7
@@
#include <linux/videodev2.h>
#include <linux/bitmap.h>
#include <linux/fb.h>
#include <linux/videodev2.h>
#include <linux/bitmap.h>
#include <linux/fb.h>
+#include <linux/of.h>
#include <media/v4l2-mediabus.h>
#include <video/videomode.h>
#include <media/v4l2-mediabus.h>
#include <video/videomode.h>
@@
-344,6
+345,7
@@
struct ipu_client_platformdata {
int dc;
int dp;
int dma[2];
int dc;
int dp;
int dma[2];
+ struct device_node *of_node;
};
#endif /* __DRM_IPU_H__ */
};
#endif /* __DRM_IPU_H__ */