diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:56:35 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:56:35 +0100 |
commit | 05b7b842fa1798c4775997602d42f3d6373e7ef3 (patch) | |
tree | a0942796d362b68c893ec1d92c106a6f04010545 /drivers/input/mouse | |
parent | Merge commit 'v3.3-rc6' into next (diff) | |
parent | bcm5974: Add pointer and buttonpad properties (diff) | |
download | linux-05b7b842fa1798c4775997602d42f3d6373e7ef3.tar.xz linux-05b7b842fa1798c4775997602d42f3d6373e7ef3.zip |
Merge branch 'for-next' of github.com:rydberg/linux into next
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/bcm5974.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 927e479c2649..f9e2758b9f46 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -433,6 +433,7 @@ static void setup_events_to_report(struct input_dev *input_dev, __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit); __set_bit(BTN_LEFT, input_dev->keybit); + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); if (cfg->caps & HAS_INTEGRATED_BUTTON) __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit); |