aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-w90x900
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-09 21:22:22 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-09 21:24:26 -0700
commit09113aea553cfaf074fd669cd0465daac4cea6e8 (patch)
tree0b03d3e292e5a244fbbd0b504dc9e4090bdbeb81 /arch/arm/mach-w90x900
parent4a15235e79f5160a34100b362af2c674d191d0a5 (diff)
Input: w90p910_keypad - adjust to use definitions from matrix_keypad.h
Also have the driver send MSC_SCAN events as most keyboards do to aid in updating keymap from userspace. Tested-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'arch/arm/mach-w90x900')
-rw-r--r--arch/arm/mach-w90x900/include/mach/w90p910_keypad.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h b/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
index 79462faaa18..556778e8dda 100644
--- a/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
+++ b/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
@@ -6,13 +6,10 @@
extern void mfp_set_groupi(struct device *dev);
struct w90p910_keypad_platform_data {
+ const struct matrix_keymap_data *keymap_data;
unsigned int prescale;
unsigned int debounce;
- unsigned int matrix_key_rows;
- unsigned int matrix_key_cols;
- unsigned int *matrix_key_map;
- int matrix_key_map_size;
};
#endif /* __ASM_ARCH_W90P910_KEYPAD_H */