projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.20' into for-linus
[linux-2.6-block.git]
/
include
/
uapi
/
linux
/
input.h
diff --git
a/include/uapi/linux/input.h
b/include/uapi/linux/input.h
index fb78f6f500f37d19bf5dc531ba90c1e5f23746a5..ffab958bc5123d99964141826d6e2fdba96e2dd6 100644
(file)
--- a/
include/uapi/linux/input.h
+++ b/
include/uapi/linux/input.h
@@
-26,13
+26,17
@@
*/
struct input_event {
*/
struct input_event {
-#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)
+#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL
__
)
struct timeval time;
#define input_event_sec time.tv_sec
#define input_event_usec time.tv_usec
#else
__kernel_ulong_t __sec;
struct timeval time;
#define input_event_sec time.tv_sec
#define input_event_usec time.tv_usec
#else
__kernel_ulong_t __sec;
+#ifdef CONFIG_SPARC64
+ unsigned int __usec;
+#else
__kernel_ulong_t __usec;
__kernel_ulong_t __usec;
+#endif
#define input_event_sec __sec
#define input_event_usec __usec
#endif
#define input_event_sec __sec
#define input_event_usec __usec
#endif