Merge commit 'v2.6.28-rc2' into topic/asoc

[karo-tx-linux.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 79886ade070f2e791274c92814bc04bfbcff4947..e2488f5e7cb2bfc4ab275b1a2685bba103713205 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -71,5 +71,8 @@ extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
        const struct of_device_id *matches, const struct device_node *node);
 extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+extern int of_parse_phandles_with_args(struct device_node *np,
+       const char *list_name, const char *cells_name, int index,
+       struct device_node **out_node, const void **out_args);
 
 #endif /* _LINUX_OF_H */