Index: packages/redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.213
diff -u -r1.213 ChangeLog
--- packages/redboot/current/ChangeLog	13 Oct 2004 21:22:53 -0000	1.213
+++ packages/redboot/current/ChangeLog	4 Nov 2004 14:41:51 -0000
@@ -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.
Index: packages/redboot/current/src/fconfig.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/fconfig.c,v
retrieving revision 1.10
diff -u -r1.10 fconfig.c
--- packages/redboot/current/src/fconfig.c	1 Sep 2004 21:21:30 -0000	1.10
+++ packages/redboot/current/src/fconfig.c	4 Nov 2004 14:41:52 -0000
@@ -768,8 +768,8 @@
 flash_write_config(bool prompt)
 {
 #if defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH)
-    void *err_addr;
 #if !defined(CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG)
+    void *err_addr;
     int stat;
 #endif
 #endif