diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
| commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
| tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /include/linux/input.h | |
| parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index b86fb5581ce..5341e8251f8 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -238,6 +238,7 @@ struct input_absinfo { #define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 +#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ #define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 @@ -322,6 +323,7 @@ struct input_absinfo { #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 +#define KEY_DASHBOARD 204 /* AL Dashboard */ #define KEY_SUSPEND 205 #define KEY_CLOSE 206 /* AC Close */ #define KEY_PLAY 207 |