| commit | ffb96d55d13759a7e4fe4ba5fc5e3eb6fac11738 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Apr 10 10:32:50 2015 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Apr 10 11:54:07 2015 -0400 |
| tree | 7b6b8ed9deed8bd73a3bb0d5015497a2d8450dd2 | |
| parent | 59064346dd2713e5259a32d5ef55792a8f91171b [diff] | |
| parent | 4bde2e9d604f3a7d80e9bcc2c5f363746971dcd7 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
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 @@ * Note: aliases in the dts are required for this */ fdt_fixup_ethernet(blob); - - return 0; } #endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */