Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[mirror_ubuntu-zesty-kernel.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 74eb28cadbef032017ae12fe4d11ab4f70996d63..15c43f076b2307c4bfc53c0f0f7cec03e2e6f844 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1009,10 +1009,13 @@ static inline int of_get_available_child_count(const struct device_node *np)
 #endif
 
 typedef int (*of_init_fn_2)(struct device_node *, struct device_node *);
+typedef int (*of_init_fn_1_ret)(struct device_node *);
 typedef void (*of_init_fn_1)(struct device_node *);
 
 #define OF_DECLARE_1(table, name, compat, fn) \
                _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
+#define OF_DECLARE_1_RET(table, name, compat, fn) \
+               _OF_DECLARE(table, name, compat, fn, of_init_fn_1_ret)
 #define OF_DECLARE_2(table, name, compat, fn) \
                _OF_DECLARE(table, name, compat, fn, of_init_fn_2)