diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 22:14:02 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 22:14:02 +0200 |
| commit | 3d071cd313643cf82b1ce1ce4fdf08d63ad53964 (patch) | |
| tree | 874c1683f32f07614aa123f6ca5cf6c2bd443704 /drivers/input/keyboard/sh_keysc.c | |
| parent | arch/tile: remove useless set_fixmap_nocache() macro (diff) | |
| parent | Linux 3.0 (diff) | |
| download | linux-3d071cd313643cf82b1ce1ce4fdf08d63ad53964.tar.xz linux-3d071cd313643cf82b1ce1ce4fdf08d63ad53964.zip | |
Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/input/keyboard/sh_keysc.c')
| -rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 834cf98e7efb..6876700a4469 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/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 { |