diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 17:59:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 17:59:46 +0200 |
| commit | c01ad4081939f91ebd7277e8e731fd90ceb3e632 (patch) | |
| tree | 8eb0eccce6e0681400ddb5e33a9f13bfeb8a1fde /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | Input: sh_keysc - 8x8 MODE_6 fix (diff) | |
| download | linux-c01ad4081939f91ebd7277e8e731fd90ceb3e632.tar.xz linux-c01ad4081939f91ebd7277e8e731fd90ceb3e632.zip | |
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: sh_keysc - 8x8 MODE_6 fix
Input: omap-keypad - add missing input_sync()
Input: evdev - try to wake up readers only if we have full packet
Input: properly assign return value of clamp() macro.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input/sh_keysc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input/sh_keysc.h b/include/linux/input/sh_keysc.h index 649dc7f12925..5d253cd93691 100644 --- a/include/linux/input/sh_keysc.h +++ b/include/linux/input/sh_keysc.h @@ -1,7 +1,7 @@ #ifndef __SH_KEYSC_H__ #define __SH_KEYSC_H__ -#define SH_KEYSC_MAXKEYS 49 +#define SH_KEYSC_MAXKEYS 64 struct sh_keysc_info { enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, |