diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 09:19:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 09:19:55 -0700 |
| commit | 7eb1053fd00a8f0e2263697638e17da8a251aa74 (patch) | |
| tree | dcb9a521c2866d1d0c7c62503696819ead76961b /drivers/hid | |
| parent | 03a3f695cb9776cfa7da5e8e6d34fd20dd56510e (diff) | |
| parent | 388bbcade41ee68d2d1ebb51a538380ea48ae599 (diff) | |
| download | linux-7eb1053fd00a8f0e2263697638e17da8a251aa74.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: usbtouchscreen - support bigger iNexio touchscreens
Input: ads7846 - return error on regulator_get() failure
Input: twl4030-vibra - correct the power down sequence
Input: enable onkey driver of max8925
Input: use ABS_CNT rather than (ABS_MAX + 1)
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 56f314fbd4f9..c94026768570 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -811,7 +811,7 @@ static const char *relatives[REL_MAX + 1] = { [REL_WHEEL] = "Wheel", [REL_MISC] = "Misc", }; -static const char *absolutes[ABS_MAX + 1] = { +static const char *absolutes[ABS_CNT] = { [ABS_X] = "X", [ABS_Y] = "Y", [ABS_Z] = "Z", [ABS_RX] = "Rx", [ABS_RY] = "Ry", [ABS_RZ] = "Rz", |