git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
include
/
linux
/
serio.h
diff --git
a/include/linux/serio.h
b/include/linux/serio.h
index
9f38250
..
95674d9
100644
(file)
--- a/
include/linux/serio.h
+++ b/
include/linux/serio.h
@@
-211,5
+211,6
@@
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
#endif