Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / serio.h

diff --git a/include/linux/serio.h b/include/linux/serio.h
index b5552568178d9c459412bac9f10671b822ca2af4..e26f4788845fcef5f6b0ed2181cfd36163cb4327 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -41,7 +41,9 @@ struct serio {
        int (*start)(struct serio *);
        void (*stop)(struct serio *);
 
-       struct serio *parent, *child;
+       struct serio *parent;
+       struct list_head child_node;    /* Entry in parent->children list */
+       struct list_head children;
        unsigned int depth;             /* level of nesting in serio hierarchy */
 
        struct serio_driver *drv;       /* accessed from interrupt, must be protected by serio->lock and serio->sem */
@@ -54,10 +56,9 @@ struct serio {
 #define to_serio_port(d)       container_of(d, struct serio, dev)
 
 struct serio_driver {
-       void *private;
-       char *description;
+       const char *description;
 
-       struct serio_device_id *id_table;
+       const struct serio_device_id *id_table;
        bool manual_bind;
 
        void (*write_wakeup)(struct serio *);
@@ -197,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