Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / include / media / v4l2-device.h

diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index ffb69da3ce9ef85fc0271b89b9fc7a374c608580..9c581578783f4d1655d28135c6d9b242b1e96edd 100644 (file)
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -58,8 +58,6 @@ struct v4l2_device {
        struct v4l2_ctrl_handler *ctrl_handler;
        /* Device's priority state */
        struct v4l2_prio_state prio;
-       /* BKL replacement mutex. Temporary solution only. */
-       struct mutex ioctl_lock;
        /* Keep track of the references to this struct. */
        struct kref ref;
        /* Release function that is called when the ref count goes to 0. */