Merge branch 'linus' into sched/core

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

diff --git a/include/linux/serio.h b/include/linux/serio.h
index 813d26c247ece48b709a14a427f655a2c04442fc..64b473066b9aa49760d67c2d45eb695cbf0d812e 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;