From 043acf403c5548e063622f618364e655d0eaef70 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <spbnick@gmail.com>
Date: Fri, 6 Aug 2010 23:03:07 +0400
Subject: [PATCH] --- yaml --- r: 215581 b: refs/heads/master c:
 50b6369767f65c39de3d7ca17842ebc6c52888b8 h: refs/heads/master i:   215579:
 3a01441cbc781afaa6e5dfeee3a84f9ddae58238 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-input.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 16ac5af5a75b..8e9dc353cfe7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73e4008ddddc84d5f2499c17012b340a0dae153e
+refs/heads/master: 50b6369767f65c39de3d7ca17842ebc6c52888b8
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index 6c03dcc5760a..0c2908f2dbe3 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -336,6 +336,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 			map_key_clear(BTN_STYLUS);
 			break;
 
+		case 0x46: /* TabletPick */
+			map_key_clear(BTN_STYLUS2);
+			break;
+
 		default:  goto unknown;
 		}
 		break;