Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[linux-2.6-omap-h63xx.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 9f38250146744a605736879d1ba23fe969a07ad0..e72716cca57700fe51ab7adff654d799e3531529 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -175,7 +175,7 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_8042_XL  0x06
 
 /*
- * Serio types
+ * Serio protocols
  */
 #define SERIO_UNKNOWN  0x00
 #define SERIO_MSC      0x01
@@ -211,5 +211,8 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_TOUCHWIN 0x33
 #define SERIO_TAOSEVM  0x34
 #define SERIO_FUJITSU  0x35
+#define SERIO_ZHENHUA  0x36
+#define SERIO_INEXIO   0x37
+#define SERIO_TOUCHIT213       0x37
 
 #endif