From 462a0db67597b4fcd88e1301e1c6c52fdad2ce88 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 3 Nov 2011 07:22:39 -0300 Subject: [PATCH] --- yaml --- r: 285369 b: refs/heads/master c: 0c6a3b268e14ab99960028c9ad202b9aebae0a03 h: refs/heads/master i: 285367: 5009d92303d3e858571303a7b283a3ab6079f1fe v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 4 ++-- trunk/drivers/media/video/uvc/uvcvideo.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a806214cd47..eccfc983bef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb2697e0a65c6a30c2c6a4ae602dfc6fe68edb2 +refs/heads/master: 0c6a3b268e14ab99960028c9ad202b9aebae0a03 diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c index d8666ec6ffe0..b953dae5205d 100644 --- a/trunk/drivers/media/video/uvc/uvc_video.c +++ b/trunk/drivers/media/video/uvc/uvc_video.c @@ -351,8 +351,8 @@ int uvc_probe_video(struct uvc_streaming *stream, return ret; } -int uvc_commit_video(struct uvc_streaming *stream, - struct uvc_streaming_control *probe) +static int uvc_commit_video(struct uvc_streaming *stream, + struct uvc_streaming_control *probe) { return uvc_set_video_ctrl(stream, probe, 0); } diff --git a/trunk/drivers/media/video/uvc/uvcvideo.h b/trunk/drivers/media/video/uvc/uvcvideo.h index 8448edc3eccd..882159aab610 100644 --- a/trunk/drivers/media/video/uvc/uvcvideo.h +++ b/trunk/drivers/media/video/uvc/uvcvideo.h @@ -551,8 +551,6 @@ extern int uvc_video_resume(struct uvc_streaming *stream, int reset); extern int uvc_video_enable(struct uvc_streaming *stream, int enable); extern int uvc_probe_video(struct uvc_streaming *stream, struct uvc_streaming_control *probe); -extern int uvc_commit_video(struct uvc_streaming *stream, - struct uvc_streaming_control *ctrl); extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, __u8 intfnum, __u8 cs, void *data, __u16 size);