changeset 1225:89db0c354b7b

Fix compile error - from Chris Garry
author gthomas
date Sat, 20 Sep 2003 12:09:30 +0000
parents 60ed8b1b4c32
children e4e339326f84
files packages/redboot/current/ChangeLog packages/redboot/current/src/fconfig.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-20  Chris Garry  <cgarry@sweeneydesign.co.uk>
+
+    * src/fconfig.c: Variables 'stat' and '*err_addr' in function
+    flash_write_config() are now defined regardless of whether 
+    CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG is defined of not.
+
 2003-09-19  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/net/timers.c (__timer_poll): Need to call MS_TICKS_DELAY() or
--- a/packages/redboot/current/src/fconfig.c
+++ b/packages/redboot/current/src/fconfig.c
@@ -672,7 +672,7 @@ flash_lookup_alias(char *alias, char *al
 void
 flash_write_config(void)
 {
-#if defined(CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG) && defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH)
+#if defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH)
     int stat;
     void *err_addr;
 #endif