Merge branch 'drm-next' of ../drm-next into drm-linus

[pandora-kernel.git] / arch / arm / mach-pxa / include / mach / pxa27x_keypad.h

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 (file)
--- 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;