diff options
author | Tony Lindgren <tony@atomide.com> | 2009-09-24 16:23:16 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-09-24 16:23:16 -0700 |
commit | 4f5433324d1e29cf234d5b1b14782c0fc2948298 (patch) | |
tree | 8f90507db97315f47dfc5e6ad4214cfc4ca7ba94 /arch/arm/mach-omap2/board-zoom2.c | |
parent | 501e9bd5ff00ea726e91cef7df61f889bdec2105 (diff) | |
download | op-kernel-dev-4f5433324d1e29cf234d5b1b14782c0fc2948298.zip op-kernel-dev-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.gz |
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-zoom2.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 324009e..b7b3220 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -27,7 +27,7 @@ #include "mmc-twl4030.h" /* Zoom2 has Qwerty keyboard*/ -static int zoom2_twl4030_keymap[] = { +static int board_keymap[] = { KEY(0, 0, KEY_E), KEY(1, 0, KEY_R), KEY(2, 0, KEY_T), @@ -82,11 +82,15 @@ static int zoom2_twl4030_keymap[] = { 0 }; +static struct matrix_keymap_data board_map_data = { + .keymap = board_keymap, + .keymap_size = ARRAY_SIZE(board_keymap), +}; + static struct twl4030_keypad_data zoom2_kp_twl4030_data = { + .keymap_data = &board_map_data, .rows = 8, .cols = 8, - .keymap = zoom2_twl4030_keymap, - .keymapsize = ARRAY_SIZE(zoom2_twl4030_keymap), .rep = 1, }; |