include: sync event codes with kernel 5.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/include/linux/input-event-codes.h b/include/linux/input-event-codes.h
index 2bc40ad1ba17af0590ad9d741f7ce101da27366a..c9489f38ca79d1896269bb6a6c17d50c08fb9fb5 100644 (file)
--- a/include/linux/input-event-codes.h
+++ b/include/linux/input-event-codes.h
@@ -716,6 +716,8 @@
  * the situation described above.
  */
 #define REL_RESERVED           0x0a
+#define REL_WHEEL_HI_RES       0x0b
+#define REL_HWHEEL_HI_RES      0x0c
 #define REL_MAX                        0x0f
 #define REL_CNT                        (REL_MAX+1)
 

diff --git a/include/linux/input.h b/include/linux/input.h
index 857480785ec916e26ce9ef34e114924c6a27b8ec..8ad54ccb957f618f02d3f6497c2ace2e324ede3a 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -24,13 +24,17 @@
  */
 
 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;
+#if defined(__sparc__) && defined(__arch64__)
+       unsigned int __usec;
+#else
        __kernel_ulong_t __usec;
+#endif
 #define input_event_sec  __sec
 #define input_event_usec __usec
 #endif