git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vmscan: split LRU lists into anon & file sets
[safe/jmp/linux-2.6]
/
include
/
linux
/
serio.h
diff --git
a/include/linux/serio.h
b/include/linux/serio.h
index
1ebf045
..
25641d9
100644
(file)
--- a/
include/linux/serio.h
+++ b/
include/linux/serio.h
@@
-87,11
+87,10
@@
void serio_unregister_port(struct serio *serio);
void serio_unregister_child_port(struct serio *serio);
int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name);
void serio_unregister_child_port(struct serio *serio);
int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name);
-static inline int serio_register_driver(struct serio_driver *drv)
+static inline int
__must_check
serio_register_driver(struct serio_driver *drv)
{
return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME);
}
{
return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME);
}
-int serio_register_driver(struct serio_driver *drv);
void serio_unregister_driver(struct serio_driver *drv);
static inline int serio_write(struct serio *serio, unsigned char data)
void serio_unregister_driver(struct serio_driver *drv);
static inline int serio_write(struct serio *serio, unsigned char data)
@@
-175,7
+174,7
@@
static inline void serio_unpin_driver(struct serio *serio)
#define SERIO_8042_XL 0x06
/*
#define SERIO_8042_XL 0x06
/*
- * Serio
type
s
+ * Serio
protocol
s
*/
#define SERIO_UNKNOWN 0x00
#define SERIO_MSC 0x01
*/
#define SERIO_UNKNOWN 0x00
#define SERIO_MSC 0x01
@@
-209,5
+208,10
@@
static inline void serio_unpin_driver(struct serio *serio)
#define SERIO_PENMOUNT 0x31
#define SERIO_TOUCHRIGHT 0x32
#define SERIO_TOUCHWIN 0x33
#define SERIO_PENMOUNT 0x31
#define SERIO_TOUCHRIGHT 0x32
#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
#endif