From 377a0bbdc07d2a04adbd7b5c2a4e2024179d659b Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Sat, 18 Jun 2011 02:51:52 -0700 Subject: [PATCH] --- yaml --- r: 253824 b: refs/heads/master c: cca23d0b5350c9ca0473625c3f5879422ba534a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/sh_keysc.c | 2 +- trunk/include/linux/input/sh_keysc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 610207843a0c..13b24469d007 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b27af563befa95686c8d1abc491408aa6b9a31dc +refs/heads/master: cca23d0b5350c9ca0473625c3f5879422ba534a6 diff --git a/trunk/drivers/input/keyboard/sh_keysc.c b/trunk/drivers/input/keyboard/sh_keysc.c index 834cf98e7efb..6876700a4469 100644 --- a/trunk/drivers/input/keyboard/sh_keysc.c +++ b/trunk/drivers/input/keyboard/sh_keysc.c @@ -32,7 +32,7 @@ static const struct { [SH_KEYSC_MODE_3] = { 2, 4, 7 }, [SH_KEYSC_MODE_4] = { 3, 6, 6 }, [SH_KEYSC_MODE_5] = { 4, 6, 7 }, - [SH_KEYSC_MODE_6] = { 5, 7, 7 }, + [SH_KEYSC_MODE_6] = { 5, 8, 8 }, }; struct sh_keysc_priv { diff --git a/trunk/include/linux/input/sh_keysc.h b/trunk/include/linux/input/sh_keysc.h index 649dc7f12925..5d253cd93691 100644 --- a/trunk/include/linux/input/sh_keysc.h +++ b/trunk/include/linux/input/sh_keysc.h @@ -1,7 +1,7 @@ #ifndef __SH_KEYSC_H__ #define __SH_KEYSC_H__ -#define SH_KEYSC_MAXKEYS 49 +#define SH_KEYSC_MAXKEYS 64 struct sh_keysc_info { enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,