projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.17' into next
[linux-2.6-block.git]
/
drivers
/
input
/
mouse
/
psmouse-base.c
diff --git
a/drivers/input/mouse/psmouse-base.c
b/drivers/input/mouse/psmouse-base.c
index 3ab941d425ae8837927baf81455aee792b170256..26994f6a2b2ae7abe3f04a953eab9004b25d40d1 100644
(file)
--- 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)
__set_bit(REL_X, input_dev->relbit);
__set_bit(REL_Y, input_dev->relbit);
+ __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
+
psmouse->set_rate = psmouse_set_rate;
psmouse->set_resolution = psmouse_set_resolution;
psmouse->poll = psmouse_poll;