diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /board/emk/common/flash.c | |
parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
download | u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.zip u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.gz u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'board/emk/common/flash.c')
-rw-r--r-- | board/emk/common/flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c index 330978b..8579cfa 100644 --- a/board/emk/common/flash.c +++ b/board/emk/common/flash.c @@ -82,7 +82,7 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ static ulong flash_get_size(FPWV *addr, flash_info_t *info); static void flash_reset(flash_info_t *info); static int write_word_amd(flash_info_t *info, FPWV *dest, FPW data); -static flash_info_t *flash_get_info(ulong base); +flash_info_t *flash_get_info(ulong base); /*----------------------------------------------------------------------- * flash_init() @@ -142,7 +142,7 @@ static void flash_reset(flash_info_t *info) /*----------------------------------------------------------------------- */ -static flash_info_t *flash_get_info(ulong base) +flash_info_t *flash_get_info(ulong base) { int i; flash_info_t * info; |