Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#mpc83xx

[platform/kernel/u-boot.git] / board / smdk2400 / flash.c

diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c
index eb9eaa0..fd9992d 100644 (file)
--- a/board/smdk2400/flash.c
+++ b/board/smdk2400/flash.c
@@ -149,7 +149,7 @@ void flash_print_info (flash_info_t * info)
        }
        printf ("\n");
 
-  Done:
+Done:  ;
 }
 
 /*-----------------------------------------------------------------------
@@ -353,8 +353,7 @@ outahere:
  * Copy memory to flash
  */
 
-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)
 {
        vu_long *addr = (vu_long *) dest;
        ulong result;