projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
bootm-fdt.c
diff --git
a/arch/arm/lib/bootm-fdt.c
b/arch/arm/lib/bootm-fdt.c
index 4481f9e2fa9ceb26f2f54f21e67f6b825c016601..a51755070bc93bad6cb4e05618613afb07c58d9c 100644
(file)
--- a/
arch/arm/lib/bootm-fdt.c
+++ b/
arch/arm/lib/bootm-fdt.c
@@
-25,6
+25,7
@@
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_ARCH_FIXUP_FDT
int arch_fixup_fdt(void *blob)
{
bd_t *bd = gd->bd;
@@
-60,3
+61,4
@@
int arch_fixup_fdt(void *blob)
return 0;
}
+#endif