Merge branch 'uc-logic' into for-linus

[net-next-2.6.git] / drivers / hid / hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index b9877a86eca784e9744f2b5a787b4a102b4a0eff..834ef47b76d6f456184dff1adc9663160bebfa28 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -413,6 +413,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;