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.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index a38bd55909b2..eb69c52e2f64 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -187,17 +187,9 @@ struct v4l2_ctrl {
};
unsigned long flags;
void *priv;
- union {
- s32 val;
- s64 val64;
- char *string;
- void *p;
- };
- union {
+ s32 val;
+ struct {
s32 val;
- s64 val64;
- char *string;
- void *p;
} cur;
union v4l2_ctrl_ptr p_new;

Privacy Policy