diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-09-25 01:23:16 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-09-25 01:23:16 +0200 |
| commit | 4f5433324d1e29cf234d5b1b14782c0fc2948298 (patch) | |
| tree | 8f90507db97315f47dfc5e6ad4214cfc4ca7ba94 /arch/arm/plat-omap | |
| parent | omap: Fix a OMAP_MPUIO_VBASE typo for 850 (diff) | |
| download | linux-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.xz linux-4f5433324d1e29cf234d5b1b14782c0fc2948298.zip | |
omap: Fix matrix_keymap_data usage
Otherwise we'll get compile errors like:
arch/arm/plat-omap/include/mach/keypad.h:38:1: warning: "KEY" redefined
arch/arm/plat-omap/include/mach/keypad.h:39:1: warning: "PERSISTENT_KEY" redefined
...
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/keypad.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/mach/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h index 45ea3ae3c995..d91b9be334ff 100644 --- a/arch/arm/plat-omap/include/mach/keypad.h +++ b/arch/arm/plat-omap/include/mach/keypad.h @@ -10,6 +10,8 @@ #ifndef ASMARM_ARCH_KEYPAD_H #define ASMARM_ARCH_KEYPAD_H +#include <linux/input/matrix_keypad.h> + struct omap_kp_platform_data { int rows; int cols; @@ -35,9 +37,6 @@ struct omap_kp_platform_data { #define KEY_PERSISTENT 0x00800000 #define KEYNUM_MASK 0x00EFFFFF -#define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val)) -#define PERSISTENT_KEY(col, row) (((col) << 28) | ((row) << 24) | \ - KEY_PERSISTENT) #endif |