diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 20:16:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 20:16:07 +0400 |
| commit | d638d4990bfb99998420e78e8fd4607bca5cf8d0 (patch) | |
| tree | 8f09b50e65a32403ae0348c2768bc466a9c8b764 /include/linux/input.h | |
| parent | 8c6b065b792061c2e471d530127f2348fd9d243d (diff) | |
| parent | 5a6eb676d3bc4d7a6feab200a92437b62ad298da (diff) | |
| download | linux-d638d4990bfb99998420e78e8fd4607bca5cf8d0.tar.xz | |
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: appletouch - improve powersaving for Geyser3 devices
Input: lifebook - fix an oops on Panasonic CF-18
Input: document intended meaning of KEY_SWITCHVIDEOMODE
Input: switch to using seq_list_xxx helpers
Input: i8042 - give more trust to PNP data on i386
Input: add driver for Fujitsu serial touchscreens
Input: ads7846 - re-check pendown status before reporting events
Input: ads7846 - introduce sample settling delay
Input: xpad - add support for leds on xbox 360 pad
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 18c98b543030..e02c6a66b2ba 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -344,7 +344,8 @@ struct input_absinfo { #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 -#define KEY_SWITCHVIDEOMODE 227 +#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video + outputs (Monitor/LCD/TV-out/etc) */ #define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 |