Commit 2a50b256 authored by Linus Torvalds's avatar Linus Torvalds

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
parents ba933beb ab96ddec
...@@ -212,7 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio) ...@@ -212,7 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio)
#define SERIO_FUJITSU 0x35 #define SERIO_FUJITSU 0x35
#define SERIO_ZHENHUA 0x36 #define SERIO_ZHENHUA 0x36
#define SERIO_INEXIO 0x37 #define SERIO_INEXIO 0x37
#define SERIO_TOUCHIT213 0x37 #define SERIO_TOUCHIT213 0x38
#define SERIO_W8001 0x39 #define SERIO_W8001 0x39
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment