Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile

1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 95674d97dab..25641d9e0ea 100644
--- 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);
-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);
 }
-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)
@@ -175,7 +174,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
@@ -212,5 +211,7 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_TAOSEVM   0x34
 #define SERIO_FUJITSU   0x35
 #define SERIO_ZHENHUA   0x36
+#define SERIO_INEXIO    0x37
+#define SERIO_TOUCHIT213        0x37
 
 #endif