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/input.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/input.h')
| -rw-r--r-- | include/linux/input.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 83524e4f3290..6fcc9101beeb 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -1155,7 +1155,7 @@ struct input_dev { | |||
| 1155 | 1155 | ||
| 1156 | int sync; | 1156 | int sync; |
| 1157 | 1157 | ||
| 1158 | int abs[ABS_MAX + 1]; | 1158 | int abs[ABS_CNT]; |
| 1159 | int rep[REP_MAX + 1]; | 1159 | int rep[REP_MAX + 1]; |
| 1160 | 1160 | ||
| 1161 | unsigned long key[BITS_TO_LONGS(KEY_CNT)]; | 1161 | unsigned long key[BITS_TO_LONGS(KEY_CNT)]; |
| @@ -1163,11 +1163,11 @@ struct input_dev { | |||
| 1163 | unsigned long snd[BITS_TO_LONGS(SND_CNT)]; | 1163 | unsigned long snd[BITS_TO_LONGS(SND_CNT)]; |
| 1164 | unsigned long sw[BITS_TO_LONGS(SW_CNT)]; | 1164 | unsigned long sw[BITS_TO_LONGS(SW_CNT)]; |
| 1165 | 1165 | ||
| 1166 | int absmax[ABS_MAX + 1]; | 1166 | int absmax[ABS_CNT]; |
| 1167 | int absmin[ABS_MAX + 1]; | 1167 | int absmin[ABS_CNT]; |
| 1168 | int absfuzz[ABS_MAX + 1]; | 1168 | int absfuzz[ABS_CNT]; |
| 1169 | int absflat[ABS_MAX + 1]; | 1169 | int absflat[ABS_CNT]; |
| 1170 | int absres[ABS_MAX + 1]; | 1170 | int absres[ABS_CNT]; |
| 1171 | 1171 | ||
| 1172 | int (*open)(struct input_dev *dev); | 1172 | int (*open)(struct input_dev *dev); |
| 1173 | void (*close)(struct input_dev *dev); | 1173 | void (*close)(struct input_dev *dev); |