projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
input
/
input-compat.h
diff --git
a/drivers/input/input-compat.h
b/drivers/input/input-compat.h
index
22be27b
..
148f66f
100644
(file)
--- a/
drivers/input/input-compat.h
+++ b/
drivers/input/input-compat.h
@@
-67,7
+67,7
@@
struct ff_effect_compat {
static inline size_t input_event_size(void)
{
- return
INPUT_COMPAT_TEST
?
+ return
(INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME)
?
sizeof(struct input_event_compat) : sizeof(struct input_event);
}