From 080bdb7f3a0227bc2f34a3b2d4e6f573dab3ca3a Mon Sep 17 00:00:00 2001
From: Wolfgang Denk
Date: Wed, 5 Oct 2005 01:51:29 +0200
Subject: * Move dm9161.c and lxt972.c into cpu/arm920t/at91rm9200   Patch by
 Anders Larsen, 29 Apr 2005

* Fix problems introduced by Patch by Steven Scholz, 02 Mar 2005
  (8e2be51de8dd03c1ce4d06cbb18ad06133d47cd5)
---
 drivers/cfi_flash.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'drivers')

diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index 23c0244f3e8..ca6bd89b0c5 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -188,7 +188,9 @@ static ulong flash_get_size (ulong base, int banknum);
 static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
 static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
 				    ulong tout, char *prompt);
+#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
 static flash_info_t *flash_get_info(ulong base);
+#endif
 #ifdef CFG_FLASH_USE_BUFFER_WRITE
 static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, int len);
 #endif
@@ -365,6 +367,7 @@ unsigned long flash_init (void)
 
 /*-----------------------------------------------------------------------
  */
+#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
 static flash_info_t *flash_get_info(ulong base)
 {
 	int i;
@@ -379,6 +382,7 @@ static flash_info_t *flash_get_info(ulong base)
 
 	return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
+#endif
 
 /*-----------------------------------------------------------------------
  */
-- 
cgit v1.2.3