summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-16 20:17:56 +0100
committerWolfgang Denk <wd@denx.de>2011-11-16 20:17:56 +0100
commit3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121 (patch)
treeb3d5489872d44793fb8d736aa90445f076867d4b /include
parentc7801ee43b6263246e782000b71753caac5fe9c6 (diff)
parent07e12784966c1d61b07861e6971fb8750a2ecc0c (diff)
downloadu-boot-imx-3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121.zip
u-boot-imx-3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121.tar.gz
u-boot-imx-3844d1c782f9f3a5c72ccdbd4fa141f9c03d1121.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-fdt
* 'master' of git://git.denx.de/u-boot-fdt: 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h
index c7b4605..cef3c65 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,