diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
| commit | d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8 (patch) | |
| tree | 56e92b487de80090a998ff3c0469375982156802 /drivers/input/input-compat.h | |
| parent | Revert "Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01" (diff) | |
| parent | Input: goodix - use generic touchscreen_properties (diff) | |
| download | linux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.tar.xz linux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.16 merge window.
Diffstat (limited to 'drivers/input/input-compat.h')
| -rw-r--r-- | drivers/input/input-compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h index 1563160a7af3..08cd755e73fd 100644 --- a/drivers/input/input-compat.h +++ b/drivers/input/input-compat.h @@ -18,7 +18,8 @@ #ifdef CONFIG_COMPAT struct input_event_compat { - struct compat_timeval time; + compat_ulong_t sec; + compat_ulong_t usec; __u16 type; __u16 code; __s32 value; |