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

[~andy/linux] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 109b237603b6eb7a6d2f2abe4f4f3242a6ea2de2..e26f4788845fcef5f6b0ed2181cfd36163cb4327 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -198,5 +198,6 @@ static inline void serio_continue_rx(struct serio *serio)
 #define SERIO_W8001    0x39
 #define SERIO_DYNAPRO  0x3a
 #define SERIO_HAMPSHIRE        0x3b
+#define SERIO_PS2MULT  0x3c
 
 #endif