Fix merge problems

[u-boot] / include / environment.h

diff --git a/include/environment.h b/include/environment.h
index dcb7c5a3859951bd59426b6d926b8ddb8b2cfb2b..481ea733dba772dd08739f1222af6628601d59e0 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -117,4 +117,7 @@ unsigned char env_get_char_memory (int index);
 /* Function that updates CRC of the enironment */
 void env_crc_update (void);
 
+/* [re]set to the default environment */
+void set_default_env(void);
+
 #endif /* _ENVIRONMENT_H_ */