Assignment from incompatible pointer type.
Make the parameter declarations agree.

Signed-off-by: Il Han <[email protected]>
---
 drivers/staging/media/dt3155v4l/dt3155v4l.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c 
b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 04e93c4..2e50924 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -218,9 +218,9 @@ dt3155_start_acq(struct dt3155_priv *pd)
  *     driver-specific callbacks (vb2_ops)
  */
 static int
-dt3155_queue_setup(struct vb2_queue *q, unsigned int *num_buffers,
-                       unsigned int *num_planes, unsigned long sizes[],
-                                               void *alloc_ctxs[])
+dt3155_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
+                       unsigned int *num_buffers, unsigned int *num_planes,
+                       unsigned long sizes[], void *alloc_ctxs[])
 {
        struct dt3155_priv *pd = vb2_get_drv_priv(q);
        void *ret;
@@ -262,7 +262,7 @@ dt3155_buf_prepare(struct vb2_buffer *vb)
 }
 
 static int
-dt3155_start_streaming(struct vb2_queue *q)
+dt3155_start_streaming(struct vb2_queue *q, unsigned int count)
 {
        return 0;
 }
-- 
1.7.4.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to