diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 23:23:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 23:23:44 -0400 |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /include/uapi/linux | |
| parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
| parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 4649ee35b605..2fb6fae50e90 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h | |||
| @@ -194,6 +194,8 @@ struct input_keymap_entry { | |||
| 194 | #define SYN_CONFIG 1 | 194 | #define SYN_CONFIG 1 |
| 195 | #define SYN_MT_REPORT 2 | 195 | #define SYN_MT_REPORT 2 |
| 196 | #define SYN_DROPPED 3 | 196 | #define SYN_DROPPED 3 |
| 197 | #define SYN_MAX 0xf | ||
| 198 | #define SYN_CNT (SYN_MAX+1) | ||
| 197 | 199 | ||
| 198 | /* | 200 | /* |
| 199 | * Keys and buttons | 201 | * Keys and buttons |