Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 48defc4d181e620be3a5204f0ff935685abd000f..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