diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-04-23 07:20:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 12:41:07 -0400 |
commit | 528f0f785c042c80294708c5ae2c8005b4a0ee60 (patch) | |
tree | 792db76eb99d3a539fa1ed5556d0438ddacd4185 /include/media | |
parent | 5c37598142621ca8aadfd115d8e5f51c5337f8d5 (diff) |
[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 <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-ctrls.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | 26 | ||
27 | /* forward references */ | 27 | /* forward references */ |
28 | struct file; | ||
28 | struct v4l2_ctrl_handler; | 29 | struct v4l2_ctrl_handler; |
29 | struct v4l2_ctrl_helper; | 30 | struct v4l2_ctrl_helper; |
30 | struct v4l2_ctrl; | 31 | struct v4l2_ctrl; |
@@ -498,7 +499,6 @@ extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops; | |||
498 | void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new); | 499 | void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new); |
499 | void v4l2_ctrl_merge(const struct v4l2_event *old, struct v4l2_event *new); | 500 | void v4l2_ctrl_merge(const struct v4l2_event *old, struct v4l2_event *new); |
500 | 501 | ||
501 | struct file; | ||
502 | /* Can be used as a vidioc_log_status function that just dumps all controls | 502 | /* Can be used as a vidioc_log_status function that just dumps all controls |
503 | associated with the filehandle. */ | 503 | associated with the filehandle. */ |
504 | int v4l2_ctrl_log_status(struct file *file, void *fh); | 504 | int v4l2_ctrl_log_status(struct file *file, void *fh); |