Merge with /home/wd/git/u-boot/master

[oweals/u-boot.git] / board / m5272c3 / flash.c

diff --git a/board/m5272c3/flash.c b/board/m5272c3/flash.c
index fb918435c81a4f305d770b0ea606ecbb1792a05b..ea0b1fd7e0942a126cae6585a208b10bbb32b82d 100644 (file)
--- a/board/m5272c3/flash.c
+++ b/board/m5272c3/flash.c
@@ -65,6 +65,7 @@ void flash_print_info (flash_info_t * info)
        printf ("\n");
 
       Done:
+       return;
 }
 
 
@@ -256,8 +257,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
        return rc;
 }
 
-
-volatile static int write_word (flash_info_t * info, ulong dest, ulong data)
+static int write_word (flash_info_t * info, ulong dest, ulong data)
 {
        volatile u16 *addr = (volatile u16 *) dest;
        ulong result;