diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-16 12:51:52 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-16 12:51:52 +0900 |
| commit | 13beb8851e931b3cfb3403c3a62bfee9ab27a60c (patch) | |
| tree | 6993a8ef1558050d4d41e22fd656ec3e4f61f99a /include | |
| parent | ceafc84623c8ef94c13a87363277a595988b2b79 (diff) | |
| parent | a317907a68af5f1509b1b38e3bf378a5178f1c3a (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
Conflicts:
drivers/of/base.c
drivers/of/fdt.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 078a187d518c..ae6e390be7a5 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -279,6 +279,9 @@ extern struct device_node *of_parse_phandle(const struct device_node *np, extern 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); +extern int of_parse_phandle_with_fixed_args(const struct device_node *np, + const char *list_name, int cells_count, int index, + struct of_phandle_args *out_args); extern int of_count_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name); @@ -489,6 +492,13 @@ static inline int of_parse_phandle_with_args(struct device_node *np, return -ENOSYS; } +static inline int of_parse_phandle_with_fixed_args(const struct device_node *np, + const char *list_name, int cells_count, int index, + struct of_phandle_args *out_args) +{ + return -ENOSYS; +} + static inline int of_count_phandle_with_args(struct device_node *np, const char *list_name, const char *cells_name) |