Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / cogent / flash.c

diff --git a/board/cogent/flash.c b/board/cogent/flash.c
index 207380f09939db895d086679e00d4be060f44409..1da8f10a1f955b370851f49eabd4151d45fec489 100644 (file)
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <board/cogent/flash.h>
+#include "flash.h"
 #include <linux/compiler.h>
 
 flash_info_t   flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@ -487,7 +487,7 @@ flash_erase(flash_info_t *info, int s_first, int s_last)
 
        if (haderr > 0) {
                printf (" failed\n");
-               rcode = 1;
+               rcode = 1;
        }
        else
                printf (" done\n");