diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/linux/serio.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/linux/serio.h')
| -rw-r--r-- | include/linux/serio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index 95674d97dabd..e72716cca577 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
| @@ -175,7 +175,7 @@ static inline void serio_unpin_driver(struct serio *serio) | |||
| 175 | #define SERIO_8042_XL 0x06 | 175 | #define SERIO_8042_XL 0x06 |
| 176 | 176 | ||
| 177 | /* | 177 | /* |
| 178 | * Serio types | 178 | * Serio protocols |
| 179 | */ | 179 | */ |
| 180 | #define SERIO_UNKNOWN 0x00 | 180 | #define SERIO_UNKNOWN 0x00 |
| 181 | #define SERIO_MSC 0x01 | 181 | #define SERIO_MSC 0x01 |
| @@ -212,5 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio) | |||
| 212 | #define SERIO_TAOSEVM 0x34 | 212 | #define SERIO_TAOSEVM 0x34 |
| 213 | #define SERIO_FUJITSU 0x35 | 213 | #define SERIO_FUJITSU 0x35 |
| 214 | #define SERIO_ZHENHUA 0x36 | 214 | #define SERIO_ZHENHUA 0x36 |
| 215 | #define SERIO_INEXIO 0x37 | ||
| 216 | #define SERIO_TOUCHIT213 0x37 | ||
| 215 | 217 | ||
| 216 | #endif | 218 | #endif |