diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/envfs.h | 1 | ||||
| -rw-r--r-- | include/linux/marvell_phy.h | 2 | ||||
| -rw-r--r-- | include/linux/xz.h | 8 | ||||
| -rw-r--r-- | include/of.h | 2 | ||||
| -rw-r--r-- | include/stringlist.h | 6 |
5 files changed, 11 insertions, 8 deletions
diff --git a/include/envfs.h b/include/envfs.h index fdcb8a8d97..27c4b42c6b 100644 --- a/include/envfs.h +++ b/include/envfs.h @@ -2,6 +2,7 @@ #define _ENVFS_H #ifdef __BAREBOX__ +#include <errno.h> #include <asm/byteorder.h> #include <linux/stringify.h> #endif diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index bf2c66ac65..b7baae137d 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -27,6 +27,8 @@ #define MARVELL_PHY_ID_88E1318S 0x01410e90 #define MARVELL_PHY_ID_88E1116R 0x01410e40 #define MARVELL_PHY_ID_88E1510 0x01410dd0 +#define MARVELL_PHY_ID_88E1543 0x01410ea0 +#define MARVELL_PHY_ID_88E1545 0x01410eb0 /* Mask used for ID comparisons */ #define MARVELL_PHY_ID_MASK 0xfffffff0 diff --git a/include/linux/xz.h b/include/linux/xz.h index a3c2b7766a..d1afab0562 100644 --- a/include/linux/xz.h +++ b/include/linux/xz.h @@ -262,10 +262,10 @@ XZ_EXTERN void xz_crc32_init(void); XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc); #endif -STATIC int decompress_unxz(unsigned char *in, long in_size, - long (*fill)(void *dest, unsigned long size), - long (*flush)(void *src, unsigned long size), - unsigned char *out, long *in_used, +STATIC int decompress_unxz(unsigned char *in, int in_size, + int (*fill)(void *dest, unsigned int size), + int (*flush)(void *src, unsigned int size), + unsigned char *out, int *in_used, void (*error)(char *x)); #endif 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) |