diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-04 23:46:18 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-10 22:11:34 -0700 |
commit | bd96f37895197563bc1d6d6f7c012b3ae7df1c45 (patch) | |
tree | 5cf94f01fc14e84df2147cc04ecd4482b7cf08e2 /arch/arm/mach-pxa | |
parent | 7cac9cd935533e52e277c0c8799a8ba16c24f250 (diff) | |
download | op-kernel-dev-bd96f37895197563bc1d6d6f7c012b3ae7df1c45.zip op-kernel-dev-bd96f37895197563bc1d6d6f7c012b3ae7df1c45.tar.gz |
Input: pxa27x_keypad - allow modifying keymap from userspace
Tested-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h index 63e8965..7b4eadc 100644 --- a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h @@ -6,6 +6,8 @@ #define MAX_MATRIX_KEY_ROWS (8) #define MAX_MATRIX_KEY_COLS (8) +#define MATRIX_ROW_SHIFT (3) +#define MAX_DIRECT_KEY_NUM (8) /* pxa3xx keypad platform specific parameters * @@ -34,7 +36,7 @@ struct pxa27x_keypad_platform_data { /* direct keys */ int direct_key_num; - unsigned int direct_key_map[8]; + unsigned int direct_key_map[MAX_DIRECT_KEY_NUM]; /* rotary encoders 0 */ int enable_rotary0; |