diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:40:51 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:40:51 -0700 |
commit | 7774036808011ceecc88cef01dfafcce39ed9fc5 (patch) | |
tree | e88670cf3fba9d885b3d71c00fb9a7809ed3f9e2 /drivers/input/touchscreen/mms114.c | |
parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
parent | 51c80b74002f86477d691ed7c8ac479dcfa6271c (diff) | |
download | linux-7774036808011ceecc88cef01dfafcce39ed9fc5.tar.gz linux-7774036808011ceecc88cef01dfafcce39ed9fc5.tar.xz |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Merge Henrik's updates to multitouch code. Even though Jiri already
pulled them in I need to do it too since my changes to evdev using
dynamic major would clash with them.
Diffstat (limited to 'drivers/input/touchscreen/mms114.c')
-rw-r--r-- | drivers/input/touchscreen/mms114.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c index 49c44bbf548d..560cf09d1c5a 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c @@ -404,7 +404,7 @@ static int __devinit mms114_probe(struct i2c_client *client, input_set_abs_params(input_dev, ABS_Y, 0, data->pdata->y_size, 0, 0); /* For multi touch */ - input_mt_init_slots(input_dev, MMS114_MAX_TOUCH); + input_mt_init_slots(input_dev, MMS114_MAX_TOUCH, 0); input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, MMS114_MAX_AREA, 0, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_X, |