diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-09 15:37:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-09 15:37:40 -0800 |
| commit | b5b3159cff66b5b6830701d318b470d4b3e9a57f (patch) | |
| tree | e5549a32e3151d498eff5851eb63f36bf565f1ee /include | |
| parent | e69ec487b2c7c82ef99b4b15122f58a2a99289a3 (diff) | |
| parent | 1021dcf19db1387bc0db26d14bbcba719923a466 (diff) | |
| download | linux-b5b3159cff66b5b6830701d318b470d4b3e9a57f.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a few small fixups here"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: imx_sc_key - only take the valid data from SCU firmware as key state
Input: add safety guards to input_set_keycode()
Input: input_event - fix struct padding on sparc64
Input: uinput - always report EPOLLOUT
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index f056b2a00d5c..9a61c28ed3ae 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -34,6 +34,7 @@ struct input_event { __kernel_ulong_t __sec; #if defined(__sparc__) && defined(__arch64__) unsigned int __usec; + unsigned int __pad; #else __kernel_ulong_t __usec; #endif |