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/ili210x.c | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
| parent | 51c80b74002f86477d691ed7c8ac479dcfa6271c (diff) | |
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/ili210x.c')
| -rw-r--r-- | drivers/input/touchscreen/ili210x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c index c0044175a921..4ac69760ec08 100644 --- a/drivers/input/touchscreen/ili210x.c +++ b/drivers/input/touchscreen/ili210x.c @@ -252,7 +252,7 @@ static int __devinit ili210x_i2c_probe(struct i2c_client *client, input_set_abs_params(input, ABS_Y, 0, ymax, 0, 0); /* Multi touch */ - input_mt_init_slots(input, MAX_TOUCHES); + input_mt_init_slots(input, MAX_TOUCHES, 0); input_set_abs_params(input, ABS_MT_POSITION_X, 0, xmax, 0, 0); input_set_abs_params(input, ABS_MT_POSITION_Y, 0, ymax, 0, 0); |