summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-18 10:17:38 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:51:39 +0900
commit3cd5389d2a42489d34ef7eb6b1b4a8c959b2b9d5 (patch)
tree0ab38d2560a687d149678d4cced7e27308bca37d /include
parent0b12a5b0f00d7c2a91655445d5938a6a0e2e48f6 (diff)
downloadlinux-3.10-3cd5389d2a42489d34ef7eb6b1b4a8c959b2b9d5.tar.gz
linux-3.10-3cd5389d2a42489d34ef7eb6b1b4a8c959b2b9d5.tar.bz2
linux-3.10-3cd5389d2a42489d34ef7eb6b1b4a8c959b2b9d5.zip
upstream: v4l2-common: warning fix (W=1): add a missed function prototype
changeset d1e9b7c12 added a new ancilliary function to API, but forgot to add it to the corresponding header file. drivers/media/v4l2-core/v4l2-ctrls.c:568:18: warning: no previous prototype for 'v4l2_ctrl_get_int_menu' [-Wmissing-prototypes] const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len) Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/v4l2-common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 1d93c48cb37..e6d5603fd9d 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -86,6 +86,7 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
const char * const *menu_items);
const char *v4l2_ctrl_get_name(u32 id);
const char * const *v4l2_ctrl_get_menu(u32 id);
+const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len);
int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);
int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu,
struct v4l2_queryctrl *qctrl, const char * const *menu_items);