Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / arm / mach-socfpga / misc.c

diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 5f988e3ae894ae6f1220983f0a6db6ba2665af35..dd6b53b24df06a8162c8e16bd6765e55c57d3a78 100644 (file)
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -16,7 +16,6 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/system_manager.h>
-#include <asm/arch/dwmmc.h>
 #include <asm/arch/nic301.h>
 #include <asm/arch/scu.h>
 #include <asm/pl310.h>
@@ -173,7 +172,7 @@ static int socfpga_eth_reset(void)
 #else
 static int socfpga_eth_reset(void)
 {
-       return 0
+       return 0;
 };
 #endif
 
@@ -363,7 +362,7 @@ int arch_early_init_r(void)
         * issuing warm reset. The ancient kernel code expects this
         * value to be written into the register by the bootloader, so
         * to support that old code, we write it here instead of in the
-        * reset_cpu() function just before reseting the CPU.
+        * reset_cpu() function just before resetting the CPU.
         */
        writel(0xae9efebc, &sysmgr_regs->romcodegrp_warmramgrp_enable);