diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /arch/arm/plat-samsung/include/plat/keypad.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/keypad.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/keypad.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/keypad.h b/arch/arm/plat-samsung/include/plat/keypad.h index b59a648..997220f 100644 --- a/arch/arm/plat-samsung/include/plat/keypad.h +++ b/arch/arm/plat-samsung/include/plat/keypad.h @@ -14,9 +14,13 @@ #define __PLAT_SAMSUNG_KEYPAD_H #include <linux/input/matrix_keypad.h> - +#if defined(CONFIG_MACH_M0_GRANDECTC) || defined(CONFIG_MACH_IRON) +#define SAMSUNG_MAX_ROWS 14 +#define SAMSUNG_MAX_COLS 8 +#else #define SAMSUNG_MAX_ROWS 8 #define SAMSUNG_MAX_COLS 8 +#endif /** * struct samsung_keypad_platdata - Platform device data for Samsung Keypad. |