Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/board/netstar/flash.c b/board/netstar/flash.c
index f555c0c..692c416 100644 (file)
--- a/board/netstar/flash.c
+++ b/board/netstar/flash.c
@@ -230,7 +230,7 @@ out:
  * Copy memory to flash
  */
 
-volatile static int write_hword(flash_info_t *info, ulong dest, ushort data)
+static int write_hword(flash_info_t *info, ulong dest, ushort data)
 {
        vu_short *addr = (vu_short *) dest;
        ushort result;