diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
| commit | 73eed452b9c9827474c0789c30729dca6fcf061d (patch) | |
| tree | b33a39a41b7b2891b0171f79ea9b5599658884c3 /arch/arm/lib/bootm-fdt.c | |
| parent | bfb380b30ad2d678c09037560abb6f09a5e9c9b6 (diff) | |
| parent | a2558e8729831e0bcef634ea2440e60425ef0ff6 (diff) | |
| download | u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.zip u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.gz u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
Diffstat (limited to 'arch/arm/lib/bootm-fdt.c')
| -rw-r--r-- | arch/arm/lib/bootm-fdt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index a517550..4481f9e 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -25,7 +25,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { bd_t *bd = gd->bd; @@ -61,4 +60,3 @@ int arch_fixup_fdt(void *blob) return 0; } -#endif |