diff options
author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /include/media/v4l2-ctrls.h | |
parent | include: dt-binding: input: create a DT header defining key codes. (diff) | |
parent | Linux 3.11-rc7 (diff) | |
download | linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.xz linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r-- | include/media/v4l2-ctrls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 7343a27fe819..47ada23345a1 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -22,6 +22,7 @@ #define _V4L2_CTRLS_H #include <linux/list.h> +#include <linux/mutex.h> #include <linux/videodev2.h> /* forward references */ |