aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2013-08-12 08:51:55 +0200
committerH. Nikolaus Schaller <hns@goldelico.com>2013-08-12 11:14:48 +0200
commitdb8ed0d584495a1354d2265bc3735faff2e8dfb7 (patch)
treefcda47f851b8305831fca434af24db84ad27d78f /include/media
parent37f0589d2e6587febc415fad091e9051175360c8 (diff)
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff)
downloadkernel_goldelico_gta04-db8ed0d584495a1354d2265bc3735faff2e8dfb7.zip
kernel_goldelico_gta04-db8ed0d584495a1354d2265bc3735faff2e8dfb7.tar.gz
kernel_goldelico_gta04-db8ed0d584495a1354d2265bc3735faff2e8dfb7.tar.bz2
Merge commit Linux-3.11-rc5 'd4e4ab86bcba5a72779c43dc1459f71fea3d89c8' into neil-3.1x-plus
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ctrls.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 7343a27..47ada23 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 */