aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-18 21:35:38 +0100
committerWolfgang Denk <wd@denx.de>2009-02-18 22:40:08 +0100
commitb8845abdc0dcf20d0944e965153f5ae7a9c3077c (patch)
tree13a8ac19761b46cd842ab766b6ed227b0bef2895
parent5f0320108870e5d62983d1d5c13a2a087dddf686 (diff)
downloadu-boot-linaro-stable-b8845abdc0dcf20d0944e965153f5ae7a9c3077c.tar.gz
Fix build errors after making flash_get_info() non-static
Fix for these build problems: error: static declaration of 'flash_get_info' follows non-static declaration Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--board/emk/common/flash.c4
-rw-r--r--board/evb64260/flash.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c
index 330978b95..8579cfaad 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;
diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c
index 115e8cd4d..825bbaf70 100644
--- a/board/evb64260/flash.c
+++ b/board/evb64260/flash.c
@@ -54,7 +54,6 @@ flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
static ulong flash_get_size (int portwidth, vu_long *addr, flash_info_t *info);
static int write_word (flash_info_t *info, ulong dest, ulong data);
static void flash_get_offsets (ulong base, flash_info_t *info);
-static flash_info_t *flash_get_info(ulong base);
/*-----------------------------------------------------------------------
*/
@@ -178,7 +177,7 @@ flash_get_offsets (ulong base, 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;