diff options
| author | Tony Lindgren | 2009-09-25 01:23:16 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2009-09-25 01:23:16 +0200 |
| commit | 4f5433324d1e29cf234d5b1b14782c0fc2948298 (patch) | |
| tree | 8f90507db97315f47dfc5e6ad4214cfc4ca7ba94 /arch/arm/mach-omap2/board-omap3pandora.c | |
| parent | omap: Fix a OMAP_MPUIO_VBASE typo for 850 (diff) | |
| download | kernel-qcow2-linux-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.gz kernel-qcow2-linux-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.xz kernel-qcow2-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/mach-omap2/board-omap3pandora.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index b43f6e36b6d9..7f6bf8772af7 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -133,7 +133,7 @@ static void __init pandora_keys_gpio_init(void) omap_set_gpio_debounce_time(32 * 5, GPIO_DEBOUNCE_TIME); } -static int pandora_keypad_map[] = { +static int board_keymap[] = { /* col, row, code */ KEY(0, 0, KEY_9), KEY(0, 1, KEY_0), @@ -180,11 +180,15 @@ static int pandora_keypad_map[] = { KEY(5, 2, KEY_FN), }; +static struct matrix_keymap_data board_map_data = { + .keymap = board_keymap, + .keymap_size = ARRAY_SIZE(board_keymap), +}; + static struct twl4030_keypad_data pandora_kp_data = { + .keymap_data = &board_map_data, .rows = 8, .cols = 6, - .keymap = pandora_keypad_map, - .keymapsize = ARRAY_SIZE(pandora_keypad_map), .rep = 1, }; |