diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:37:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:37:41 -0700 |
| commit | a89b7717a8c9be41a4856134b60a4d7a66df13f6 (patch) | |
| tree | 89578ae1ecf1fb7ac2501d0b3173783b8101d648 /include/linux | |
| parent | 29dd5a7733fcb72696e90247ffbab57b0a591f67 (diff) | |
| parent | eb76c5c03caaa2b5c362b8514fb727047baa8fd9 (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: linux-input mailing list moved to vger.kernel.org
Input: inport, logibm - use KERN_INFO when reporting missing mouse
Input: appletouch - idle reset logic broke older Fountains
Input: hp_sdc.c - fix section mismatch
Input: appletouch - add Johannes Berg as maintainer
Input: Add Euro and Dollar key codes
Input: xpad - add more USB IDs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 62268929856..b45f240a8c4 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -527,6 +527,9 @@ struct input_absinfo { #define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ #define KEY_LOGOFF 0x1b1 /* AL Logoff */ +#define KEY_DOLLAR 0x1b2 +#define KEY_EURO 0x1b3 + #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 #define KEY_INS_LINE 0x1c2 |