# HG changeset patch
# User asl
# Date 1100025997 0
# Node ID b9ae2f90a53eaf8ec63cb0481416a9886125809d
# Parent  02bcdae3fa9ccef95da840ce17c0c9be9479addc
        * src/fconfig.c (flash_write_config): Removed compiler warning
        when building redboot with combined FIS and config.

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- 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.
diff --git a/packages/redboot/current/src/fconfig.c b/packages/redboot/current/src/fconfig.c
--- 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