From 4e1b51c7778c743f1cf1c5decd43f34f2f013ba8 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 4 Sep 2008 22:28:31 -0400 Subject: [PATCH] --- yaml --- r: 109663 b: refs/heads/master c: a6821f345fd508b17f5ce310b677b37aefb028dc h: refs/heads/master i: 109661: aeecc12e9a6b423d9818351cb067b884e7bd1deb 109659: 8cfeb23717e38a23a0de6c0b771185ec59753f6c 109655: 9ced0a405eb4f7e349e280dfff315985e35ca682 109647: 217ea37f0b05e6af211f213dc85565f8f74efab3 109631: 286d33e8a82eab52820ca19b257342dce4a91476 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/bcm5974.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a4ef538bf96a..cbc24488e631 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75e21e3f3bb2b4a41bb0646a4d54eef27eb36ca5 +refs/heads/master: a6821f345fd508b17f5ce310b677b37aefb028dc diff --git a/trunk/drivers/input/mouse/bcm5974.c b/trunk/drivers/input/mouse/bcm5974.c index 8568211c5564..18f4d7f6ce6d 100644 --- a/trunk/drivers/input/mouse/bcm5974.c +++ b/trunk/drivers/input/mouse/bcm5974.c @@ -253,6 +253,7 @@ static void setup_events_to_report(struct input_dev *input_dev, 0, cfg->y.dim, cfg->y.fuzz, 0); __set_bit(EV_KEY, input_dev->evbit); + __set_bit(BTN_TOUCH, input_dev->keybit); __set_bit(BTN_TOOL_FINGER, input_dev->keybit); __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); @@ -320,6 +321,7 @@ static int report_tp_state(struct bcm5974 *dev, int size) if (dev->fingers > nmax) dev->fingers = nmax; + input_report_key(input, BTN_TOUCH, dev->fingers > 0); input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1); input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2); input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2);