From: Laurent Pinchart Date: Mon, 23 Apr 2012 11:20:35 +0000 (-0300) Subject: [media] v4l: v4l2-ctrls: moves the forward declaration of struct file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=528f0f785c042c80294708c5ae2c8005b4a0ee60;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] v4l: v4l2-ctrls: moves the forward declaration of struct file This fixes the following warning: In file included from drivers/media/video/v4l2-subdev.c:29: include/media/v4l2-ctrls.h:501: warning: 'struct file' declared inside parameter list include/media/v4l2-ctrls.h:501: warning: its scope is only this definition or declaration, which is probably not what you want include/media/v4l2-ctrls.h:509: warning: 'struct file' declared inside parameter list Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index dde6fbacc271..5edd64daa425 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -25,6 +25,7 @@ #include /* forward references */ +struct file; struct v4l2_ctrl_handler; struct v4l2_ctrl_helper; struct v4l2_ctrl; @@ -498,7 +499,6 @@ extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops; void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new); void v4l2_ctrl_merge(const struct v4l2_event *old, struct v4l2_event *new); -struct file; /* Can be used as a vidioc_log_status function that just dumps all controls associated with the filehandle. */ int v4l2_ctrl_log_status(struct file *file, void *fh);