aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-ctrls.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r--include/media/v4l2-ctrls.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 3dbd06638506..533315bd74e0 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -130,7 +130,10 @@ struct v4l2_ctrl {
130 u32 step; 130 u32 step;
131 u32 menu_skip_mask; 131 u32 menu_skip_mask;
132 }; 132 };
133 const char * const *qmenu; 133 union {
134 const char * const *qmenu;
135 const s64 *qmenu_int;
136 };
134 unsigned long flags; 137 unsigned long flags;
135 union { 138 union {
136 s32 val; 139 s32 val;
@@ -220,6 +223,7 @@ struct v4l2_ctrl_config {
220 u32 flags; 223 u32 flags;
221 u32 menu_skip_mask; 224 u32 menu_skip_mask;
222 const char * const *qmenu; 225 const char * const *qmenu;
226 const s64 *qmenu_int;
223 unsigned int is_private:1; 227 unsigned int is_private:1;
224}; 228};
225 229