diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/clk.h | 2 | ||||
-rw-r--r-- | include/pbl.h | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/clk.h b/include/linux/clk.h index a005e7233d..d14d8b96a3 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -556,7 +556,7 @@ struct string_list; int clk_name_complete(struct string_list *sl, char *instr); -char *of_clk_get_parent_name(struct device_node *np, unsigned int index); +char *of_clk_get_parent_name(const struct device_node *np, int index); static inline void clk_unregister(struct clk *clk) { diff --git a/include/pbl.h b/include/pbl.h index f84ed3b7bf..5e971f8656 100644 --- a/include/pbl.h +++ b/include/pbl.h @@ -6,6 +6,8 @@ #ifndef __PBL_H__ #define __PBL_H__ +#include <linux/types.h> + extern unsigned long free_mem_ptr; extern unsigned long free_mem_end_ptr; @@ -13,6 +15,19 @@ void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len #ifdef __PBL__ #define IN_PBL 1 + +struct pbl_bio { + void *priv; + int (*read)(struct pbl_bio *bio, off_t block_off, void *buf, unsigned nblocks); +}; + +static inline int pbl_bio_read(struct pbl_bio *bio, off_t block_off, + void *buf, unsigned nblocks) +{ + return bio->read(bio, block_off, buf, nblocks); +} + +ssize_t pbl_fat_load(struct pbl_bio *, const char *filename, void *dest, size_t len); #else #define IN_PBL 0 #endif |