changeset 1822:b9ae2f90a53e

* src/fconfig.c (flash_write_config): Removed compiler warning when building redboot with combined FIS and config.
author asl
date Tue, 09 Nov 2004 18:46:37 +0000
parents 02bcdae3fa9c
children ecd76f498508
files packages/redboot/current/ChangeLog packages/redboot/current/src/fconfig.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-04  Peter Korsgaard  <jacmet@sunsite.dk>
+
+	* src/fconfig.c (flash_write_config): Removed compiler warning
+	when building redboot with combined FIS and config.
+
 2004-10-10	Iztok Zupet	 <iz@elsis.si>
 
 	* cdl/redboot.cdl: added CYGSEM_REDBOOT_DISK_IDE_VMWARE option.
--- a/packages/redboot/current/src/fconfig.c
+++ b/packages/redboot/current/src/fconfig.c
@@ -768,8 +768,8 @@ void
 flash_write_config(bool prompt)
 {
 #if defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH)
+#if !defined(CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG)
     void *err_addr;
-#if !defined(CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG)
     int stat;
 #endif
 #endif