diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 09:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 09:16:07 -0700 |
| commit | d638d4990bfb99998420e78e8fd4607bca5cf8d0 (patch) | |
| tree | 8f09b50e65a32403ae0348c2768bc466a9c8b764 /include/linux/serio.h | |
| parent | 8c6b065b792061c2e471d530127f2348fd9d243d (diff) | |
| parent | 5a6eb676d3bc4d7a6feab200a92437b62ad298da (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: 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/serio.h')
| -rw-r--r-- | include/linux/serio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index d9377ce9ffd..9f382501467 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -210,5 +210,6 @@ static inline void serio_unpin_driver(struct serio *serio) #define SERIO_TOUCHRIGHT 0x32 #define SERIO_TOUCHWIN 0x33 #define SERIO_TAOSEVM 0x34 +#define SERIO_FUJITSU 0x35 #endif |