diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 12:49:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 12:49:16 -0500 |
| commit | e7de369050534025b33aab1033358bf47a577e4d (patch) | |
| tree | fed44f469923690b98f9de2c87e6d1de76f71dc9 /drivers/input/mouse/synaptics.c | |
| parent | 87530db5ec7d519c7ba334e414307c5130ae2da8 (diff) | |
| parent | eab9edd27f7ceaad6b57085817d63287bda15190 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 97cdfd6acaca..2051bec2c394 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
| @@ -652,6 +652,8 @@ int synaptics_init(struct psmouse *psmouse) | |||
| 652 | psmouse->disconnect = synaptics_disconnect; | 652 | psmouse->disconnect = synaptics_disconnect; |
| 653 | psmouse->reconnect = synaptics_reconnect; | 653 | psmouse->reconnect = synaptics_reconnect; |
| 654 | psmouse->pktsize = 6; | 654 | psmouse->pktsize = 6; |
| 655 | /* Synaptics can usually stay in sync without extra help */ | ||
| 656 | psmouse->resync_time = 0; | ||
| 655 | 657 | ||
| 656 | if (SYN_CAP_PASS_THROUGH(priv->capabilities)) | 658 | if (SYN_CAP_PASS_THROUGH(priv->capabilities)) |
| 657 | synaptics_pt_create(psmouse); | 659 | synaptics_pt_create(psmouse); |