diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 00:45:21 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 00:45:21 -0700 |
commit | 0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0 (patch) | |
tree | 7187a6807ff5bd6e8f8dac7c53e2de28759a8354 /drivers/hid/hid-magicmouse.c | |
parent | dde3ada3d0069855eeb353707b2b0f946191cfd6 (diff) | |
parent | 7f8d4cad1e4e11a45d02bd6e024cc2812963c38a (diff) |
Merge branch 'next' into for-linus
Prepare second set of updates for 3.7 merge window (Wacom driver update
and patches extending number of input minors).
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
-rw-r--r-- | drivers/hid/hid-magicmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 73647266daad..25ddf3e3aec6 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -392,7 +392,7 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd __set_bit(EV_ABS, input->evbit); - error = input_mt_init_slots(input, 16); + error = input_mt_init_slots(input, 16, 0); if (error) return error; input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2, |