On Tue, Jan 10, 2012 at 12:42:12PM +0100, Henrik Rydberg wrote:

On Tue, Jan 10, 2012 at 12:56:49PM +0200, Jussi Pakkanen wrote:

quoted

Some bcm5974 trackpads have a physical button beneath the physical surface.
This patch sets the property bit so user space applications can
detect the trackpad type and act accordingly.

Signed-off-by: Jussi Pakkanen <redacted>
Cc: stable@vger.kernel.org

Applied, however I removed stable notation as this change IMO does not
qualify for the stable since it does not address a regression.

Thanks.

quoted

---
 drivers/input/mouse/bcm5974.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 5ec617e..913e9fa 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c

@@ -433,6 +433,9 @@ 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);
 
+	if (cfg->caps & HAS_INTEGRATED_BUTTON)
+		__set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+
 	input_set_events_per_packet(input_dev, 60);
 }
 

-- 
1.7.5.4

    Reviewed-by: Henrik Rydberg [off-list ref]

Thanks,
Henrik

-- 
Dmitry