diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-25 01:11:17 -0400 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /drivers/input/mousedev.c | |
| parent | f9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff) | |
| parent | 6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index d528a2dba064..98973340d042 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -866,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, | |||
| 866 | spin_lock_init(&mousedev->client_lock); | 866 | spin_lock_init(&mousedev->client_lock); |
| 867 | mutex_init(&mousedev->mutex); | 867 | mutex_init(&mousedev->mutex); |
| 868 | lockdep_set_subclass(&mousedev->mutex, | 868 | lockdep_set_subclass(&mousedev->mutex, |
| 869 | minor == MOUSEDEV_MIX ? MOUSEDEV_MIX : 0); | 869 | minor == MOUSEDEV_MIX ? SINGLE_DEPTH_NESTING : 0); |
| 870 | init_waitqueue_head(&mousedev->wait); | 870 | init_waitqueue_head(&mousedev->wait); |
| 871 | 871 | ||
| 872 | if (minor == MOUSEDEV_MIX) | 872 | if (minor == MOUSEDEV_MIX) |