diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-06-04 13:33:10 +0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-06-04 13:33:10 +0400 |
| commit | d8a382d2662822248a97ce9d670b90e68aefbd3a (patch) | |
| tree | 4f5bbd5d0a5881ed42de611402ea4ac2c6d6ff48 /include/linux/input.h | |
| parent | 45c34e05c4e3d36e7c44e790241ea11a1d90d54e (diff) | |
| parent | c6df8d5ab87a246942d138321e1721edbb69f6e1 (diff) | |
| download | linux-d8a382d2662822248a97ce9d670b90e68aefbd3a.tar.xz | |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 7ed2251b33f1..6fcc9101beeb 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -806,6 +806,7 @@ struct input_absinfo { #define BUS_HOST 0x19 #define BUS_GSC 0x1A #define BUS_ATARI 0x1B +#define BUS_SPI 0x1C /* * MT_TOOL types @@ -1154,7 +1155,7 @@ struct input_dev { int sync; - int abs[ABS_MAX + 1]; + int abs[ABS_CNT]; int rep[REP_MAX + 1]; unsigned long key[BITS_TO_LONGS(KEY_CNT)]; @@ -1162,11 +1163,11 @@ struct input_dev { unsigned long snd[BITS_TO_LONGS(SND_CNT)]; unsigned long sw[BITS_TO_LONGS(SW_CNT)]; - int absmax[ABS_MAX + 1]; - int absmin[ABS_MAX + 1]; - int absfuzz[ABS_MAX + 1]; - int absflat[ABS_MAX + 1]; - int absres[ABS_MAX + 1]; + int absmax[ABS_CNT]; + int absmin[ABS_CNT]; + int absfuzz[ABS_CNT]; + int absflat[ABS_CNT]; + int absres[ABS_CNT]; int (*open)(struct input_dev *dev); void (*close)(struct input_dev *dev); |