diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 11:41:58 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 11:41:58 -0400 |
| commit | 5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d (patch) | |
| tree | 819d3f27a826f29210398615f4918a4cd9154836 /drivers/input/mouse/synaptics.c | |
| parent | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (diff) | |
| parent | 6ac8a99b906b01eaceef0057dbee4a225a32c423 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 8c324403b9f2..96b70a43515f 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
| @@ -635,8 +635,8 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) | |||
| 635 | __clear_bit(REL_X, dev->relbit); | 635 | __clear_bit(REL_X, dev->relbit); |
| 636 | __clear_bit(REL_Y, dev->relbit); | 636 | __clear_bit(REL_Y, dev->relbit); |
| 637 | 637 | ||
| 638 | dev->absres[ABS_X] = priv->x_res; | 638 | input_abs_set_res(dev, ABS_X, priv->x_res); |
| 639 | dev->absres[ABS_Y] = priv->y_res; | 639 | input_abs_set_res(dev, ABS_Y, priv->y_res); |
| 640 | 640 | ||
| 641 | if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { | 641 | if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { |
| 642 | /* Clickpads report only left button */ | 642 | /* Clickpads report only left button */ |