diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/hid-input.c | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
| download | linux-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.gz linux-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.bz2 linux-8b66a16f25f819bb1f132f075c5c01a288776cf8.zip | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index b9877a86eca7..834ef47b76d6 100644 --- 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; |