diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:58:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:58:09 -0400 |
| commit | e1441b9a41c33aa9236008a7cfe49a8e723fb397 (patch) | |
| tree | 87053114a75777dfdc6a81de97ae43fc55991ad8 /include | |
| parent | 70c85057e0bde35eb56352a293ecb5d1641a0334 (diff) | |
| parent | 656acd2bbc4ce7f224de499ee255698701396c48 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: fix locking in force-feedback core
Input: add KEY_MEDIA_REPEAT definition
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index e075c4b762fb..d150c57e5f0a 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -534,8 +534,8 @@ struct input_absinfo { | |||
| 534 | 534 | ||
| 535 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ | 535 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ |
| 536 | #define KEY_FRAMEFORWARD 0x1b5 | 536 | #define KEY_FRAMEFORWARD 0x1b5 |
| 537 | |||
| 538 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ | 537 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ |
| 538 | #define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ | ||
| 539 | 539 | ||
| 540 | #define KEY_DEL_EOL 0x1c0 | 540 | #define KEY_DEL_EOL 0x1c0 |
| 541 | #define KEY_DEL_EOS 0x1c1 | 541 | #define KEY_DEL_EOS 0x1c1 |