Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.git] / arch / arm / mach-omap1 / board-innovator.c

diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 8d59b07..a36e674 100644 (file)
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -44,17 +44,16 @@
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define INNOVATOR1610_ETHR_START       0x04000300
 
-static int innovator_keymap[] = {
+static const unsigned int innovator_keymap[] = {
        KEY(0, 0, KEY_F1),
-       KEY(0, 3, KEY_DOWN),
+       KEY(3, 0, KEY_DOWN),
        KEY(1, 1, KEY_F2),
-       KEY(1, 2, KEY_RIGHT),
-       KEY(2, 0, KEY_F3),
-       KEY(2, 1, KEY_F4),
+       KEY(2, 1, KEY_RIGHT),
+       KEY(0, 2, KEY_F3),
+       KEY(1, 2, KEY_F4),
        KEY(2, 2, KEY_UP),
-       KEY(3, 2, KEY_ENTER),
+       KEY(2, 3, KEY_ENTER),
        KEY(3, 3, KEY_LEFT),
-       0
 };
 
 static struct mtd_partition innovator_partitions[] = {
@@ -126,11 +125,15 @@ static struct resource innovator_kp_resources[] = {
        },
 };
 
+static const struct matrix_keymap_data innovator_keymap_data = {
+       .keymap         = innovator_keymap,
+       .keymap_size    = ARRAY_SIZE(innovator_keymap),
+};
+
 static struct omap_kp_platform_data innovator_kp_data = {
        .rows           = 8,
        .cols           = 8,
-       .keymap         = innovator_keymap,
-       .keymapsize     = ARRAY_SIZE(innovator_keymap),
+       .keymap_data    = &innovator_keymap_data,
        .delay          = 4,
 };