summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:14:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:14:19 -0700
commit2a50b2560ee956808da0b644cb529608dee65274 (patch)
tree7065f72e76919f571580378b3758acc1355564dd /include
parentba933beb11b46b6d90d53b7220858148d8687ab1 (diff)
parentab96ddec7213004b632d24dc2cdcd2df5f16f50b (diff)
downloadop-kernel-dev-2a50b2560ee956808da0b644cb529608dee65274.zip
op-kernel-dev-2a50b2560ee956808da0b644cb529608dee65274.tar.gz
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')
-rw-r--r--include/linux/serio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 1bcb357..e0417e4 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -212,7 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio)
#define SERIO_FUJITSU 0x35
#define SERIO_ZHENHUA 0x36
#define SERIO_INEXIO 0x37
-#define SERIO_TOUCHIT213 0x37
+#define SERIO_TOUCHIT213 0x38
#define SERIO_W8001 0x39
#endif
OpenPOWER on IntegriCloud