diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
| commit | c2b5a7015b7323af4b7c8cf19a06b954f4f09949 (patch) | |
| tree | d32f79304bc72bcdbb1f274d9722e15b8aaba65c /include | |
| parent | d3933bd3501bb31c696bee25e183b5511c49759a (diff) | |
| parent | 48ba0a1afda33907fcc4ce4119a7762dda5d7404 (diff) | |
| download | barebox-c2b5a7015b7323af4b7c8cf19a06b954f4f09949.tar.gz barebox-c2b5a7015b7323af4b7c8cf19a06b954f4f09949.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/of.h | 2 | ||||
| -rw-r--r-- | include/stringlist.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/of.h b/include/of.h index 7b93c58474..5273f87ebd 100644 --- a/include/of.h +++ b/include/of.h @@ -98,7 +98,7 @@ void of_print_cmdline(struct device_node *root); void of_print_nodes(struct device_node *node, int indent); int of_probe(void); int of_parse_dtb(struct fdt_header *fdt); -struct device_node *of_unflatten_dtb(void *fdt); +struct device_node *of_unflatten_dtb(const void *fdt); struct cdev; diff --git a/include/stringlist.h b/include/stringlist.h index 127998cb6e..e85500a994 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -8,10 +8,10 @@ struct string_list { char *str; }; -int string_list_add(struct string_list *sl, char *str); +int string_list_add(struct string_list *sl, const char *str); int string_list_add_asprintf(struct string_list *sl, const char *fmt, ...); -int string_list_add_sorted(struct string_list *sl, char *str); -int string_list_contains(struct string_list *sl, char *str); +int string_list_add_sorted(struct string_list *sl, const char *str); +int string_list_contains(struct string_list *sl, const char *str); void string_list_print_by_column(struct string_list *sl); static inline void string_list_init(struct string_list *sl) |