diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-01 10:29:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-01 10:29:41 -0800 |
| commit | 92cf44e284d0c2e456d43c0951107a4ec046ef1c (patch) | |
| tree | c0ceefad6371024e4d058db1cb34a8c08960312c /include | |
| parent | d3fc425e819be7c251a9c208cd4c0a6373c19bfe (diff) | |
| parent | 2425f1808123bf69a8f66d4ec90e0d0e302c2613 (diff) | |
| download | linux-92cf44e284d0c2e456d43c0951107a4ec046ef1c.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "We are disabling automatic probing of BYD touchpads as it results in too many false positives, and the hardware is not terribly popular and having the protocol support does not result in significantly improved user experience. We also change keycode for KEY_DATA to avoid clashing with KEY_FASTREVERSE. Luckily this newish code is used by CEC framework that is still in staging, so it is extremely unlikely that someone has already started using this keycode" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: change KEY_DATA from 0x275 to 0x277 Input: psmouse - disable automatic probing of BYD touchpads
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index d6d071fc3c56..3af60ee69053 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -640,7 +640,7 @@ * Control a data application associated with the currently viewed channel, * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) */ -#define KEY_DATA 0x275 +#define KEY_DATA 0x277 #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 |