summaryrefslogtreecommitdiff
path: root/board/sbc2410x/flash.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-11-20 14:34:57 -0600
committerJon Loeliger <jdl@freescale.com>2007-11-20 14:34:57 -0600
commit890e9413c0af74a3d74f37d9ab6d19784990fa0c (patch)
tree0e802d5d143e09751f85c76bf02f94aca023d077 /board/sbc2410x/flash.c
parent1d8a49eca1c7bdc8db1c47a92f9014a29ead03ae (diff)
parent9a337ddc154a10a26f117fd147b009abcdeba75a (diff)
downloadu-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.zip
u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.gz
u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.bz2
Merge commit 'remotes/wd/master'
Diffstat (limited to 'board/sbc2410x/flash.c')
-rw-r--r--board/sbc2410x/flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/sbc2410x/flash.c b/board/sbc2410x/flash.c
index f2718f2..0c669e4 100644
--- a/board/sbc2410x/flash.c
+++ b/board/sbc2410x/flash.c
@@ -288,7 +288,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
* 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;