summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-10 10:32:50 -0400
committerTom Rini <trini@konsulko.com>2015-04-10 11:54:07 -0400
commitffb96d55d13759a7e4fe4ba5fc5e3eb6fac11738 (patch)
tree7b6b8ed9deed8bd73a3bb0d5015497a2d8450dd2
parent59064346dd2713e5259a32d5ef55792a8f91171b (diff)
parent4bde2e9d604f3a7d80e9bcc2c5f363746971dcd7 (diff)
downloadu-boot-imx-ffb96d55d13759a7e4fe4ba5fc5e3eb6fac11738.zip
u-boot-imx-ffb96d55d13759a7e4fe4ba5fc5e3eb6fac11738.tar.gz
u-boot-imx-ffb96d55d13759a7e4fe4ba5fc5e3eb6fac11738.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-fdt
-rw-r--r--arch/nios2/cpu/fdt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c
index 5024682..79f72aa 100644
--- a/arch/nios2/cpu/fdt.c
+++ b/arch/nios2/cpu/fdt.c
@@ -34,7 +34,5 @@ void ft_cpu_setup(void *blob, bd_t *bd)
* Note: aliases in the dts are required for this
*/
fdt_fixup_ethernet(blob);
-
- return 0;
}
#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */