diff options
| author | Wolfgang Denk | 2011-11-16 20:18:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk | 2011-11-16 20:18:05 +0100 |
| commit | f31f496e306489184c6963e0d56d0cf7b2c9cd0b (patch) | |
| tree | ed23c60148634abdfeb9a12d7a593ee1795c44e9 /include | |
| parent | 10d6c6965f253dfa3cad0a92024d2cc9868193c7 (diff) | |
| parent | 3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
Fix constness of the fdt void pointer in fdt_getprop_u32_default
Add some missing endian conversions in fdt_support.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/fdt_support.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h index c7b4605f06e..cef3c6509d1 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -28,8 +28,8 @@ #include <fdt.h> -u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop, - const u32 dflt); +u32 fdt_getprop_u32_default(const void *fdt, const char *path, + const char *prop, const u32 dflt); int fdt_chosen(void *fdt, int force); int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force); void do_fixup_by_path(void *fdt, const char *path, const char *prop, |