diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-06 22:12:29 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-06 22:12:29 -0400 |
commit | 15e8cb70b4ebe79aced432323eaafcd176341017 (patch) | |
tree | 6ffb2830190be08c9b0b2b3bd06d1f89e4edf287 /arch/arm/mach-socfpga/misc.c | |
parent | 7b4f17bf3653ffff0d5d7b76bb8c2d8c293db4ce (diff) | |
parent | 5289c5fa5371dada10e9cbdcdbf3fb010905ea2d (diff) | |
download | u-boot-15e8cb70b4ebe79aced432323eaafcd176341017.tar.gz u-boot-15e8cb70b4ebe79aced432323eaafcd176341017.tar.xz u-boot-15e8cb70b4ebe79aced432323eaafcd176341017.zip |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/misc.c')
-rw-r--r-- | arch/arm/mach-socfpga/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index dd05e14c05..5cbd8a4325 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -172,7 +172,7 @@ static int socfpga_eth_reset(void) #else static int socfpga_eth_reset(void) { - return 0 + return 0; }; #endif |