aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/input-compat.h
diff options
context:
space:
mode:
authorH. J. Lu <hjl.tools@gmail.com>2012-02-10 14:10:52 -0800
committerH. Peter Anvin <hpa@zytor.com>2012-02-20 12:48:47 -0800
commitf930a7a0f4c87bf3ee731383421ebf3164009ee7 (patch)
tree9f7702464501cf71c2759036f60ca76c6e98f4c2 /drivers/input/input-compat.h
parentcompat: Handle COMPAT_USE_64BIT_TIME in the lp driver (diff)
downloadlinux-dev-f930a7a0f4c87bf3ee731383421ebf3164009ee7.tar.xz
linux-dev-f930a7a0f4c87bf3ee731383421ebf3164009ee7.zip
compat: Use COMPAT_USE_64BIT_TIME in the input subsystem
Enable the input system to be used with a compat ABI with 64-bit time. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/input-compat.h')
-rw-r--r--drivers/input/input-compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 22be27b424de..148f66fe3205 100644
--- 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);
}