summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 09:40:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 09:40:27 -0800
commit87450bd55d6f7caa472b5db49a97ca373baf2577 (patch)
tree00cc4e9da0e486c5d540c2f733a75a9230405f40 /include
parent055d219441cc23f631240335fd369b6b5852681a (diff)
parentcfaea56741360311d0dabcb6603fa78c2e3de155 (diff)
downloadlinux-87450bd55d6f7caa472b5db49a97ca373baf2577.tar.gz
linux-87450bd55d6f7caa472b5db49a97ca373baf2577.tar.bz2
linux-87450bd55d6f7caa472b5db49a97ca373baf2577.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: matrix_keypad - increase the limit of rows and columns Input: wacom - fix error path in wacom_probe() Input: ads7846 - check proper condition when freeing gpio Revert "Input: do not pass injected events back to the originating handler" Input: sysrq - rework re-inject logic Input: serio - clear pending rescans after sysfs driver rebind Input: rotary_encoder - use proper irqflags Input: wacom_w8001 - report resolution to userland
Diffstat (limited to 'include')
-rw-r--r--include/linux/input/matrix_keypad.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index 697474691749..fe7c4b9ae270 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -4,8 +4,8 @@
#include <linux/types.h>
#include <linux/input.h>
-#define MATRIX_MAX_ROWS 16
-#define MATRIX_MAX_COLS 16
+#define MATRIX_MAX_ROWS 32
+#define MATRIX_MAX_COLS 32
#define KEY(row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\
(((col) & (MATRIX_MAX_COLS - 1)) << 16) |\