Merge branch 'slab/urgent' into slab/next

[pandora-kernel.git] / include / linux / regulator / driver.h

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 6c433b8..1a80bc7 100644 (file)
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -188,18 +188,16 @@ struct regulator_dev {
 
        /* lists we belong to */
        struct list_head list; /* list of all regulators */
-       struct list_head slist; /* list of supplied regulators */
 
        /* lists we own */
        struct list_head consumer_list; /* consumers we supply */
-       struct list_head supply_list; /* regulators we supply */
 
        struct blocking_notifier_head notifier;
        struct mutex mutex; /* consumer lock */
        struct module *owner;
        struct device dev;
        struct regulation_constraints *constraints;
-       struct regulator_dev *supply;   /* for tree */
+       struct regulator *supply;       /* for tree */
 
        void *reg_data;         /* regulator_dev data */