diff options
| author | Dmitry Torokhov | 2012-10-01 23:40:51 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-10-01 23:40:51 +0200 |
| commit | 7774036808011ceecc88cef01dfafcce39ed9fc5 (patch) | |
| tree | e88670cf3fba9d885b3d71c00fb9a7809ed3f9e2 /drivers/input/misc/uinput.c | |
| parent | Input: hgpk - use %*ph to dump small buffer (diff) | |
| parent | Input: bcm5974 - Convert to MT-B (diff) | |
| download | kernel-qcow2-linux-7774036808011ceecc88cef01dfafcce39ed9fc5.tar.gz kernel-qcow2-linux-7774036808011ceecc88cef01dfafcce39ed9fc5.tar.xz kernel-qcow2-linux-7774036808011ceecc88cef01dfafcce39ed9fc5.zip | |
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/misc/uinput.c')
| -rw-r--r-- | drivers/input/misc/uinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 86328e9c9848..a0a4bbaef02c 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -416,7 +416,7 @@ static int uinput_setup_device(struct uinput_device *udev, goto exit; if (test_bit(ABS_MT_SLOT, dev->absbit)) { int nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1; - input_mt_init_slots(dev, nslot); + input_mt_init_slots(dev, nslot, 0); } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) { input_set_events_per_packet(dev, 60); } |