Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 1ebf045..95674d9 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -209,5 +209,8 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_PENMOUNT 0x31
 #define SERIO_TOUCHRIGHT       0x32
 #define SERIO_TOUCHWIN 0x33
+#define SERIO_TAOSEVM  0x34
+#define SERIO_FUJITSU  0x35
+#define SERIO_ZHENHUA  0x36
 
 #endif