diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
| commit | 64960848abd18d0bcde3f53ffa7ed0b631e6b25d (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /include/linux/uinput.h | |
| parent | 2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of /home/davem/src/GIT/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 | ||