diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:09:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:09:44 -0800 |
| commit | a67f1b5da2cf8b14395596048c876247b894aa5c (patch) | |
| tree | 0f125e709fddc4d32579fb267ede0f9c8079ff11 /include/linux/serio.h | |
| parent | e9e7d7fa16122d7bfa6f87188828baf6080cb02e (diff) | |
v2.4.8 -> v2.4.8.1
- Rui Sousa: emu10k1 module fixes, remove joystick part.
- Alan Cox: driver merges
- Andrea Arkangeli: alpha updates
- David Woodhouse: up_and_exit -> complete_and_exit
- David Miller: sparc and network update
- Andrew Morton: update 3c59x driver
- Neil Brown: NFS export VFAT, knfsd cleanups, raid fixes
- Ben Collins: ieee1394 updates
- Paul Mackerras: PPC update
- me: make sure we don't lose position bits in "filldir()"
Diffstat (limited to 'include/linux/serio.h')
| -rw-r--r-- | include/linux/serio.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index 2232e06ac141..3619a866ec57 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -2,7 +2,7 @@ #define _SERIO_H /* - * $Id: serio.h,v 1.8 2000/07/17 10:42:14 vojtech Exp $ + * $Id: serio.h,v 1.11 2001/05/29 02:58:50 jsimmons Exp $ * * Copyright (C) 1999 Vojtech Pavlik * @@ -104,6 +104,10 @@ static __inline__ int serio_write(struct serio *serio, unsigned char data) #define SERIO_GUNZE 0x1c #define SERIO_IFORCE 0x1d #define SERIO_STINGER 0x1e +#define SERIO_NEWTON 0x1f +#define SERIO_STOWAWAY 0x20 +#define SERIO_H3600 0x21 +#define SERIO_PS2SER 0x22 #define SERIO_ID 0xff00UL #define SERIO_EXTRA 0xff0000UL |