Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / drivers / input / input-compat.h

diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 0f25878d5fa2526c45e33fdbd461c735676bc51f..1563160a7af3c09912e3bc4a0fa8b6eaa24f3cfd 100644 (file)
--- a/drivers/input/input-compat.h
+++ b/drivers/input/input-compat.h
@@ -17,8 +17,6 @@
 
 #ifdef CONFIG_COMPAT
 
-#define INPUT_COMPAT_TEST in_compat_syscall()
-
 struct input_event_compat {
        struct compat_timeval time;
        __u16 type;
@@ -57,7 +55,7 @@ struct ff_effect_compat {
 
 static inline size_t input_event_size(void)
 {
-       return (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) ?
+       return (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) ?
                sizeof(struct input_event_compat) : sizeof(struct input_event);
 }