diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 10:57:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 10:57:00 -0400 |
| commit | 532df780a2012ad75b3f078647f229c4dabd99d1 (patch) | |
| tree | 6172d647f9c7bbd770bcd5f9f002108d671ce24f /include/linux/input.h | |
| parent | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (diff) | |
| parent | 7b6dff982b063b1b15c30508f16863e5449e7229 (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: usbtouchscreen - correctly set 'phys'
Input: i8042 - add HP Pavilion DV4270ca to the MUX blacklist
Input: i8042 - fix modpost warning
Input: add more Braille keycodes
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 cf2b5619aa13..36e00aa6f03b 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -558,6 +558,8 @@ struct input_absinfo { | |||
| 558 | #define KEY_BRL_DOT6 0x1f6 | 558 | #define KEY_BRL_DOT6 0x1f6 |
| 559 | #define KEY_BRL_DOT7 0x1f7 | 559 | #define KEY_BRL_DOT7 0x1f7 |
| 560 | #define KEY_BRL_DOT8 0x1f8 | 560 | #define KEY_BRL_DOT8 0x1f8 |
| 561 | #define KEY_BRL_DOT9 0x1f9 | ||
| 562 | #define KEY_BRL_DOT10 0x1fa | ||
| 561 | 563 | ||
| 562 | /* We avoid low common keys in module aliases so they don't get huge. */ | 564 | /* We avoid low common keys in module aliases so they don't get huge. */ |
| 563 | #define KEY_MIN_INTERESTING KEY_MUTE | 565 | #define KEY_MIN_INTERESTING KEY_MUTE |