summaryrefslogtreecommitdiff
path: root/include/uapi/linux/videodev2.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 09:26:49 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 09:26:49 -0700
commit692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch)
treea9e49c040d361ea2293a8966832378def5a06714 /include/uapi/linux/videodev2.h
parente4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff)
parente2c3ecf0ea8e87c5209371af7da107ebc47a5639 (diff)
downloadlinux-next-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.gz
linux-next-692d96552c9a86a919fe6b5b82288a6c77c015a5.zip
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'include/uapi/linux/videodev2.h')
-rw-r--r--include/uapi/linux/videodev2.h4
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 {
struct v4l2_rect {
__s32 left;
__s32 top;
- __s32 width;
- __s32 height;
+ __u32 width;
+ __u32 height;
};
struct v4l2_fract {