diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
| commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
| tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /board/smdk2410 | |
| parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
| download | u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 | |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'board/smdk2410')
| -rw-r--r-- | board/smdk2410/flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c index 993946b..376930b 100644 --- a/board/smdk2410/flash.c +++ b/board/smdk2410/flash.c @@ -290,7 +290,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; |