diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 03:45:21 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 03:45:21 -0400 |
| commit | 0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0 (patch) | |
| tree | 7187a6807ff5bd6e8f8dac7c53e2de28759a8354 /drivers/input/mouse/sentelic.c | |
| parent | dde3ada3d0069855eeb353707b2b0f946191cfd6 (diff) | |
| parent | 7f8d4cad1e4e11a45d02bd6e024cc2812963c38a (diff) | |
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/sentelic.c')
| -rw-r--r-- | drivers/input/mouse/sentelic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c index a261d8576919..e582922bacf7 100644 --- a/drivers/input/mouse/sentelic.c +++ b/drivers/input/mouse/sentelic.c | |||
| @@ -971,7 +971,7 @@ static int fsp_set_input_params(struct psmouse *psmouse) | |||
| 971 | 971 | ||
| 972 | input_set_abs_params(dev, ABS_X, 0, abs_x, 0, 0); | 972 | input_set_abs_params(dev, ABS_X, 0, abs_x, 0, 0); |
| 973 | input_set_abs_params(dev, ABS_Y, 0, abs_y, 0, 0); | 973 | input_set_abs_params(dev, ABS_Y, 0, abs_y, 0, 0); |
| 974 | input_mt_init_slots(dev, 2); | 974 | input_mt_init_slots(dev, 2, 0); |
| 975 | input_set_abs_params(dev, ABS_MT_POSITION_X, 0, abs_x, 0, 0); | 975 | input_set_abs_params(dev, ABS_MT_POSITION_X, 0, abs_x, 0, 0); |
| 976 | input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, abs_y, 0, 0); | 976 | input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, abs_y, 0, 0); |
| 977 | } | 977 | } |