Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / include / media / videobuf-core.h

diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
old mode 100644 (file)
new mode 100755 (executable)
index f2c41ce..3d8acce
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -66,6 +66,13 @@ enum videobuf_state {
        VIDEOBUF_ERROR      = 5,
        VIDEOBUF_IDLE       = 6,
 };
+#ifdef CONFIG_VIDEO_RK29XX_VOUT
+struct rk29_vaddr {
+       dma_addr_t                              base[2];
+       size_t                                  len[2];
+};
+
+#endif
 
 struct videobuf_buffer {
        unsigned int            i;
@@ -104,6 +111,9 @@ struct videobuf_buffer {
 
        /* Private pointer to allow specific methods to store their data */
        int                     privsize;
+#ifdef CONFIG_VIDEO_RK29XX_VOUT
+       struct rk29_vaddr               vaddr;
+#endif
        void                    *priv;
 };