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-rx51-peripherals.c | |
| parent | 501e9bd5ff00ea726e91cef7df61f889bdec2105 (diff) | |
| download | blackbird-op-linux-4f5433324d1e29cf234d5b1b14782c0fc2948298.tar.gz blackbird-op-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-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index e6e8290b7828..b45ad312c587 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -36,7 +36,7 @@ #define SYSTEM_REV_B_USES_VAUX3 0x1699 #define SYSTEM_REV_S_USES_VAUX3 0x8 -static int rx51_keymap[] = { +static int board_keymap[] = { KEY(0, 0, KEY_Q), KEY(0, 1, KEY_W), KEY(0, 2, KEY_E), @@ -83,11 +83,15 @@ static int rx51_keymap[] = { KEY(0xff, 5, KEY_F10), }; +static struct matrix_keymap_data board_map_data = { + .keymap = board_keymap, + .keymap_size = ARRAY_SIZE(board_keymap), +}; + static struct twl4030_keypad_data rx51_kp_data = { + .keymap_data = &board_map_data, .rows = 8, .cols = 8, - .keymap = rx51_keymap, - .keymapsize = ARRAY_SIZE(rx51_keymap), .rep = 1, }; |
