Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[pandora-kernel.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 813d26c..b555256 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -30,7 +30,6 @@ struct serio {
        char phys[32];
 
        bool manual_bind;
-       bool registered;        /* port has been fully registered with driver core */
 
        struct serio_device_id id;
 
@@ -197,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