From e82f1e74f6663675db0967c54fb81e38bd0121c1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Thu, 30 Sep 2010 09:29:37 -0300
Subject: [PATCH] --- yaml --- r: 219217 b: refs/heads/master c:
 3fd8e647eaa76a1eb5bdd0fcecf49364a089b71d h: refs/heads/master i:   219215:
 9d2eca7239750a1588d548c6859cbae38ae88b6d v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/v4l2-common.c |  7 ++++---
 trunk/include/linux/videodev2.h         |  8 --------
 trunk/include/media/v4l2-common.h       | 10 ++++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 681fde155bd0..6eb1304b155c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3cfd447d01cf723ccda0ad6bfa2e85b73d3d747
+refs/heads/master: 3fd8e647eaa76a1eb5bdd0fcecf49364a089b71d
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c
index 31ae1a138613..cef80dab1a0d 100644
--- a/trunk/drivers/media/video/v4l2-common.c
+++ b/trunk/drivers/media/video/v4l2-common.c
@@ -677,12 +677,13 @@ int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info)
 }
 EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
 
-struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
-						       s32 width, s32 height)
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+		const struct v4l2_discrete_probe *probe,
+		s32 width, s32 height)
 {
 	int i;
 	u32 error, min_error = UINT_MAX;
-	struct v4l2_frmsize_discrete *size, *best = NULL;
+	const struct v4l2_frmsize_discrete *size, *best = NULL;
 
 	if (!probe)
 		return best;
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 957d5b093847..b06479f63271 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -397,14 +397,6 @@ struct v4l2_frmsize_discrete {
 	__u32			height;		/* Frame height [pixel] */
 };
 
-struct v4l2_discrete_probe {
-	const struct v4l2_frmsize_discrete	*sizes;
-	int					num_sizes;
-};
-
-struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
-						       s32 width, s32 height);
-
 struct v4l2_frmsize_stepwise {
 	__u32			min_width;	/* Minimum frame width [pixel] */
 	__u32			max_width;	/* Maximum frame width [pixel] */
diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h
index 98b32645e5a7..41dd480e45f1 100644
--- a/trunk/include/media/v4l2-common.h
+++ b/trunk/include/media/v4l2-common.h
@@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
 			   unsigned int hmax, unsigned int halign,
 			   unsigned int salign);
 int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
+
+struct v4l2_discrete_probe {
+	const struct v4l2_frmsize_discrete	*sizes;
+	int					num_sizes;
+};
+
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+		const struct v4l2_discrete_probe *probe,
+		s32 width, s32 height);
+
 #endif /* V4L2_COMMON_H_ */