Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)

1 files changed, 18 insertions, 0 deletions

diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index 769704f296e..f9217965aaa 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -6,10 +6,20 @@
 #ifndef __LINUX_OF_REG_H
 #define __LINUX_OF_REG_H
 
+struct of_regulator_match {
+        const char *name;
+        void *driver_data;
+        struct regulator_init_data *init_data;
+        struct device_node *of_node;
+};
+
 #if defined(CONFIG_OF)
 extern struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
                                     struct device_node *node);
+extern int of_regulator_match(struct device *dev, struct device_node *node,
+                              struct of_regulator_match *matches,
+                              unsigned int num_matches);
 #else
 static inline struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
@@ -17,6 +27,14 @@ static inline struct regulator_init_data
 {
         return NULL;
 }
+
+static inline int of_regulator_match(struct device *dev,
+                                     struct device_node *node,
+                                     struct of_regulator_match *matches,
+                                     unsigned int num_matches)
+{
+        return 0;
+}
 #endif /* CONFIG_OF */
 
 #endif /* __LINUX_OF_REG_H */