diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 15:02:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 15:02:37 +0000 |
| commit | fad837c16cdd856c68ce2e1335ad0fe836ed8ecd (patch) | |
| tree | 1a6babdc2ac7e5388c482e93505fdfaf5ff97f61 /include/linux/input/sh_keysc.h | |
| parent | 51c6ab130642ed975681df843c772dda48a1d2ed (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| download | kernel_samsung_aries-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.zip kernel_samsung_aries-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.gz kernel_samsung_aries-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.bz2 | |
Merge commit 'v2.6.34-rc1' into for-2.6.35
Diffstat (limited to 'include/linux/input/sh_keysc.h')
| -rw-r--r-- | include/linux/input/sh_keysc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/input/sh_keysc.h b/include/linux/input/sh_keysc.h index c211b5c..649dc7f 100644 --- a/include/linux/input/sh_keysc.h +++ b/include/linux/input/sh_keysc.h @@ -1,14 +1,15 @@ #ifndef __SH_KEYSC_H__ #define __SH_KEYSC_H__ -#define SH_KEYSC_MAXKEYS 30 +#define SH_KEYSC_MAXKEYS 49 struct sh_keysc_info { - enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode; + enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, + SH_KEYSC_MODE_4, SH_KEYSC_MODE_5, SH_KEYSC_MODE_6 } mode; int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */ int delay; int kycr2_delay; - int keycodes[SH_KEYSC_MAXKEYS]; + int keycodes[SH_KEYSC_MAXKEYS]; /* KEYIN * KEYOUT */ }; #endif /* __SH_KEYSC_H__ */ |