diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
| commit | f772aa92c2c04d73c8dfc7f313af0877808ae16a (patch) | |
| tree | f7317e76d1326f0d0cde019cf49fe243888f9f05 /drivers/of | |
| parent | 7e33e8c076e7681b09b70641ab6783098ff99e69 (diff) | |
| parent | ee69c588417972185a1a2d72aa553410493791c2 (diff) | |
| download | barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.gz barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 2 | ||||
| -rw-r--r-- | drivers/of/fdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 1e6c33dbf2..767d4e1e36 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1631,7 +1631,7 @@ struct device_node *of_get_next_available_child(const struct device_node *node, EXPORT_SYMBOL(of_get_next_available_child); /** - * of_get_next_child - Iterate a node childs + * of_get_next_child - Iterate a node children * @node: parent node * @prev: previous child of the parent node, or NULL to get first * diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b2253aa7a2..614e136de6 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -525,7 +525,7 @@ void of_clean_reserve_map(void) * fdt_add_reserve_map - Add reserve map entries to a devicetree binary * @__fdt: The devicetree blob * - * This adds the reservemap entries previously colllected in + * This adds the reservemap entries previously collected in * of_add_reserve_entry() to a devicetree binary blob. This also * adds the devicetree itself to the reserved list, so after calling * this function the tree should not be relocated anymore. |