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-3430sdp.c | |
| parent | omap: Fix a OMAP_MPUIO_VBASE typo for 850 (diff) | |
| download | linux-dev-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.xz linux-dev-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-3430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index bd57ec76dc5e..efaf053eba85 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -54,7 +54,7 @@ #define TWL4030_MSECURE_GPIO 22 -static int sdp3430_keymap[] = { +static int board_keymap[] = { KEY(0, 0, KEY_LEFT), KEY(0, 1, KEY_RIGHT), KEY(0, 2, KEY_A), @@ -88,11 +88,15 @@ static int sdp3430_keymap[] = { 0 }; +static struct matrix_keymap_data board_map_data = { + .keymap = board_keymap, + .keymap_size = ARRAY_SIZE(board_keymap), +}; + static struct twl4030_keypad_data sdp3430_kp_data = { + .keymap_data = &board_map_data, .rows = 5, .cols = 6, - .keymap = sdp3430_keymap, - .keymapsize = ARRAY_SIZE(sdp3430_keymap), .rep = 1, }; |