diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:34:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:34:07 -0400 |
| commit | 9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch) | |
| tree | bcf7334c0e57323a6844b8147ce1c92180fe8cef /drivers/input/mouse/psmouse-base.c | |
| parent | dd4cae8bf16611053ee7b00e20aa4fa945b92b99 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 3ab941d425ae..26994f6a2b2a 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -685,6 +685,8 @@ static void psmouse_apply_defaults(struct psmouse *psmouse) | |||
| 685 | __set_bit(REL_X, input_dev->relbit); | 685 | __set_bit(REL_X, input_dev->relbit); |
| 686 | __set_bit(REL_Y, input_dev->relbit); | 686 | __set_bit(REL_Y, input_dev->relbit); |
| 687 | 687 | ||
| 688 | __set_bit(INPUT_PROP_POINTER, input_dev->propbit); | ||
| 689 | |||
| 688 | psmouse->set_rate = psmouse_set_rate; | 690 | psmouse->set_rate = psmouse_set_rate; |
| 689 | psmouse->set_resolution = psmouse_set_resolution; | 691 | psmouse->set_resolution = psmouse_set_resolution; |
| 690 | psmouse->poll = psmouse_poll; | 692 | psmouse->poll = psmouse_poll; |