Merge branch 'mpc86xx'

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

diff --git a/board/m5282evb/flash.c b/board/m5282evb/flash.c
index ff70783bda167ab153040fb6fa42fbe19619f108..36a7c310f90bd03736348af21020656b86347d65 100644 (file)
--- a/board/m5282evb/flash.c
+++ b/board/m5282evb/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;