diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /include/uapi/linux/videodev2.h | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/videodev2.h')
| -rw-r--r-- | include/uapi/linux/videodev2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 437f1b0f8937..6ae7bbe988cc 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h | |||
| @@ -207,8 +207,8 @@ enum v4l2_priority { | |||
| 207 | struct v4l2_rect { | 207 | struct v4l2_rect { |
| 208 | __s32 left; | 208 | __s32 left; |
| 209 | __s32 top; | 209 | __s32 top; |
| 210 | __s32 width; | 210 | __u32 width; |
| 211 | __s32 height; | 211 | __u32 height; |
| 212 | }; | 212 | }; |
| 213 | 213 | ||
| 214 | struct v4l2_fract { | 214 | struct v4l2_fract { |