Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / uinput.h

diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index 15ddd4483b09b9b94b47a9130bc0579c31468c74..60c81da77f0f36b94bde7d83562db55dfa707d92 100644 (file)
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -166,11 +166,11 @@ struct uinput_ff_erase {
 struct uinput_user_dev {
        char name[UINPUT_MAX_NAME_SIZE];
        struct input_id id;
-        int ff_effects_max;
-        int absmax[ABS_MAX + 1];
-        int absmin[ABS_MAX + 1];
-        int absfuzz[ABS_MAX + 1];
-        int absflat[ABS_MAX + 1];
+       int ff_effects_max;
+       int absmax[ABS_CNT];
+       int absmin[ABS_CNT];
+       int absfuzz[ABS_CNT];
+       int absflat[ABS_CNT];
 };
 #endif /* __UINPUT_H_ */