Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 64b473066b9aa49760d67c2d45eb695cbf0d812e..b5552568178d9c459412bac9f10671b822ca2af4 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -196,5 +196,6 @@ static inline void serio_continue_rx(struct serio *serio)
 #define SERIO_TOUCHIT213       0x38
 #define SERIO_W8001    0x39
 #define SERIO_DYNAPRO  0x3a
+#define SERIO_HAMPSHIRE        0x3b
 
 #endif