diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 17:40:51 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 17:40:51 -0400 |
| commit | 7774036808011ceecc88cef01dfafcce39ed9fc5 (patch) | |
| tree | e88670cf3fba9d885b3d71c00fb9a7809ed3f9e2 /drivers/input/touchscreen/penmount.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/penmount.c')
| -rw-r--r-- | drivers/input/touchscreen/penmount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c index 4ccde45b9da2..b49f0b836925 100644 --- a/drivers/input/touchscreen/penmount.c +++ b/drivers/input/touchscreen/penmount.c | |||
| @@ -264,7 +264,7 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv) | |||
| 264 | input_set_abs_params(pm->dev, ABS_Y, 0, max_y, 0, 0); | 264 | input_set_abs_params(pm->dev, ABS_Y, 0, max_y, 0, 0); |
| 265 | 265 | ||
| 266 | if (pm->maxcontacts > 1) { | 266 | if (pm->maxcontacts > 1) { |
| 267 | input_mt_init_slots(pm->dev, pm->maxcontacts); | 267 | input_mt_init_slots(pm->dev, pm->maxcontacts, 0); |
| 268 | input_set_abs_params(pm->dev, | 268 | input_set_abs_params(pm->dev, |
| 269 | ABS_MT_POSITION_X, 0, max_x, 0, 0); | 269 | ABS_MT_POSITION_X, 0, max_x, 0, 0); |
| 270 | input_set_abs_params(pm->dev, | 270 | input_set_abs_params(pm->dev, |