diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /include/linux/uinput.h | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/uinput.h')
| -rw-r--r-- | include/linux/uinput.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 15ddd4483b09..60c81da77f0f 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h | |||
| @@ -166,11 +166,11 @@ struct uinput_ff_erase { | |||
| 166 | struct uinput_user_dev { | 166 | struct uinput_user_dev { |
| 167 | char name[UINPUT_MAX_NAME_SIZE]; | 167 | char name[UINPUT_MAX_NAME_SIZE]; |
| 168 | struct input_id id; | 168 | struct input_id id; |
| 169 | int ff_effects_max; | 169 | int ff_effects_max; |
| 170 | int absmax[ABS_MAX + 1]; | 170 | int absmax[ABS_CNT]; |
| 171 | int absmin[ABS_MAX + 1]; | 171 | int absmin[ABS_CNT]; |
| 172 | int absfuzz[ABS_MAX + 1]; | 172 | int absfuzz[ABS_CNT]; |
| 173 | int absflat[ABS_MAX + 1]; | 173 | int absflat[ABS_CNT]; |
| 174 | }; | 174 | }; |
| 175 | #endif /* __UINPUT_H_ */ | 175 | #endif /* __UINPUT_H_ */ |
| 176 | 176 | ||