diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 13:14:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 13:14:19 -0400 |
| commit | 2a50b2560ee956808da0b644cb529608dee65274 (patch) | |
| tree | 7065f72e76919f571580378b3758acc1355564dd /include/linux | |
| parent | ba933beb11b46b6d90d53b7220858148d8687ab1 (diff) | |
| parent | ab96ddec7213004b632d24dc2cdcd2df5f16f50b (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: serio - fix protocol number for TouchIT213
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index 1bcb357a01a1..e0417e4d3f15 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
| @@ -212,7 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio) | |||
| 212 | #define SERIO_FUJITSU 0x35 | 212 | #define SERIO_FUJITSU 0x35 |
| 213 | #define SERIO_ZHENHUA 0x36 | 213 | #define SERIO_ZHENHUA 0x36 |
| 214 | #define SERIO_INEXIO 0x37 | 214 | #define SERIO_INEXIO 0x37 |
| 215 | #define SERIO_TOUCHIT213 0x37 | 215 | #define SERIO_TOUCHIT213 0x38 |
| 216 | #define SERIO_W8001 0x39 | 216 | #define SERIO_W8001 0x39 |
| 217 | 217 | ||
| 218 | #endif | 218 | #endif |