diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 15:37:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 15:37:46 -0800 |
| commit | 4939e27d46fee2609f2112f85f7f7cbd952075dc (patch) | |
| tree | 0f83542cb7e51d167000ce91f493bd8fdc30bdfa /drivers/of | |
| parent | c2714334b944abbeaaadda8cddde619eff0292a1 (diff) | |
| parent | 93c667ca2598bd84f1bd3f2fa176af69707699fe (diff) | |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull another devicetree update from Grant Likely:
"Here's a couple more devicetree changes that I missed in the first
pull by putting the tag in the wrong place.
Two minor devicetree fixups for v3.8. Addition of dummy inlines and
constification of node argument to of_parse_phandle_with_args()."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
of: *node argument to of_parse_phandle_with_args should be const
of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 538e3cfad23e..be846408dbc1 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle); * To get a device_node of the `node2' node you may call this: * of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args); */ -int of_parse_phandle_with_args(struct device_node *np, const char *list_name, +int of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int index, struct of_phandle_args *out_args) { |