diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
commit | b9a2512aaa22086dc84db3f55a0d912b206c11e3 (patch) | |
tree | 38cfaccf38003f10032808354fce63d1b369c9e2 /include/bootstrap.h | |
parent | b1ebbe76eb48b56ccd804636edcb5fb0b49da98a (diff) | |
parent | 0295088d53cd605aaf2a2accfd65c19c0f8a0cf0 (diff) | |
download | barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.gz barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'include/bootstrap.h')
-rw-r--r-- | include/bootstrap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/bootstrap.h b/include/bootstrap.h index 9863ff425e..d3ee6be47c 100644 --- a/include/bootstrap.h +++ b/include/bootstrap.h @@ -15,10 +15,10 @@ typedef void (*kernel_entry_func)(int zero, int arch, void *params); void bootstrap_boot(kernel_entry_func func, bool barebox); #ifdef CONFIG_BOOTSTRAP_DEVFS -void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size); #else -static inline void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +static inline void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size) { return NULL; @@ -26,9 +26,9 @@ static inline void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, #endif #ifdef CONFIG_BOOTSTRAP_DISK -void* bootstrap_read_disk(char *devname, char *fstype); +void* bootstrap_read_disk(const char *devname, const char *fstype); #else -static inline void* bootstrap_read_disk(char *devname, char *fstype) +static inline void* bootstrap_read_disk(const char *devname, const char *fstype) { return NULL; } |