Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 22be27b424def00dbd8cc0167439b508b2564b78..148f66fe3205c7a3059a26a5f9e4748dd4c4bb50 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);
 }