aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/input
diff options
context:
space:
mode:
authorTrilok Soni <tsoni@codeaurora.org>2011-02-11 00:44:41 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-02-11 01:01:23 -0800
commitcfaea56741360311d0dabcb6603fa78c2e3de155 (patch)
tree2b21a60fc72413a0e7384dc00c81a52a327e0281 /include/linux/input
parentInput: wacom - fix error path in wacom_probe() (diff)
downloadlinux-dev-cfaea56741360311d0dabcb6603fa78c2e3de155.tar.xz
linux-dev-cfaea56741360311d0dabcb6603fa78c2e3de155.zip
Input: matrix_keypad - increase the limit of rows and columns
Some keyboard controllers support more than 16 columns and rows. Increase the limit to 32. Signed-off-by: Trilok Soni <tsoni@codeaurora.org> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/input')
-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 80352ad6581a..b67feb8513a6 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) |\