Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 14:57:00 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 14:57:00 +0000 (07:57 -0700)
* '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

1  2 
include/linux/input.h

diff --combined include/linux/input.h
index cf2b5619aa13c3abad562164a1e8be85b2653c07,17df5a7331c760ce8fe9d8863453f6480076ae55..36e00aa6f03bcf84705ba49ed0cefc7f3729257b
@@@ -363,12 -363,6 +363,12 @@@ struct input_absinfo 
  
  #define KEY_UNKNOWN           240
  
 +#define KEY_VIDEO_NEXT                241     /* drive next video source */
 +#define KEY_VIDEO_PREV                242     /* drive previous video source */
 +#define KEY_BRIGHTNESS_CYCLE  243     /* brightness up, after max is min */
 +#define KEY_BRIGHTNESS_ZERO   244     /* brightness off, use ambient */
 +#define KEY_DISPLAY_OFF               245     /* display device to off state */
 +
  #define BTN_MISC              0x100
  #define BTN_0                 0x100
  #define BTN_1                 0x101
  #define KEY_BRL_DOT6          0x1f6
  #define KEY_BRL_DOT7          0x1f7
  #define KEY_BRL_DOT8          0x1f8
+ #define KEY_BRL_DOT9          0x1f9
+ #define KEY_BRL_DOT10         0x1fa
  
  /* We avoid low common keys in module aliases so they don't get huge. */
  #define KEY_MIN_INTERESTING   KEY_MUTE