summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 10:56:35 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 10:56:35 -0800
commit05b7b842fa1798c4775997602d42f3d6373e7ef3 (patch)
treea0942796d362b68c893ec1d92c106a6f04010545 /drivers/input/mouse
parentb675b3667f6729dcd1036a2a129b35445947f905 (diff)
parent7491f3dffd99fadf1239011c0ab5346925618dae (diff)
downloadblackbird-op-linux-05b7b842fa1798c4775997602d42f3d6373e7ef3.tar.gz
blackbird-op-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.c1
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);
OpenPOWER on IntegriCloud