ARM: rockchip: rk3228: add grf definition

[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 100755 (executable)
new mode 100644 (file)
index 455ba93..8c6e825
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -62,13 +62,6 @@ 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;
@@ -79,7 +72,6 @@ struct videobuf_buffer {
        unsigned int            height;
        unsigned int            bytesperline; /* use only if != 0 */
        unsigned long           size;
-       unsigned int            input;
        enum v4l2_field         field;
        enum videobuf_state     state;
        struct list_head        stream;  /* QBUF/DQBUF list */
@@ -107,9 +99,6 @@ 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;
 };
 
@@ -152,7 +141,6 @@ struct videobuf_queue {
        wait_queue_head_t          wait; /* wait if queue is empty */
 
        enum v4l2_buf_type         type;
-       unsigned int               inputs; /* for V4L2_BUF_FLAG_INPUT */
        unsigned int               msize;
        enum v4l2_field            field;
        enum v4l2_field            last;   /* for field=V4L2_FIELD_ALTERNATE */