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/input/mouse/alps.c | |
| parent | dde3ada3d0069855eeb353707b2b0f946191cfd6 (diff) | |
| parent | 7f8d4cad1e4e11a45d02bd6e024cc2812963c38a (diff) | |
| download | op-kernel-dev-0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0.zip op-kernel-dev-0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0.tar.gz | |
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/input/mouse/alps.c')
| -rw-r--r-- | drivers/input/mouse/alps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4a1347e..cf5af1f 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1620,7 +1620,7 @@ int alps_init(struct psmouse *psmouse) case ALPS_PROTO_V3: case ALPS_PROTO_V4: set_bit(INPUT_PROP_SEMI_MT, dev1->propbit); - input_mt_init_slots(dev1, 2); + input_mt_init_slots(dev1, 2, 0); input_set_abs_params(dev1, ABS_MT_POSITION_X, 0, ALPS_V3_X_MAX, 0, 0); input_set_abs_params(dev1, ABS_MT_POSITION_Y, 0, ALPS_V3_Y_MAX, 0, 0); |
