From 85af4a60e98114e31ce1848917d724f8ff3c9358 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 23 Apr 2012 08:20:35 -0300 Subject: [PATCH] --- yaml --- r: 306350 b: refs/heads/master c: 528f0f785c042c80294708c5ae2c8005b4a0ee60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-ctrls.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d61f7f014b1..ec4086765373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c37598142621ca8aadfd115d8e5f51c5337f8d5 +refs/heads/master: 528f0f785c042c80294708c5ae2c8005b4a0ee60 diff --git a/trunk/include/media/v4l2-ctrls.h b/trunk/include/media/v4l2-ctrls.h index dde6fbacc271..5edd64daa425 100644 --- a/trunk/include/media/v4l2-ctrls.h +++ b/trunk/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);