Merge branch 'master' of git://git.denx.de/u-boot-marvell

[platform/kernel/u-boot.git] / include / exports.h

diff --git a/include/exports.h b/include/exports.h
index 9588bc9..7404a7c 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -26,16 +26,13 @@ int setenv (char *varname, char *varvalue);
 long simple_strtol(const char *cp,char **endp,unsigned int base);
 int strcmp(const char * cs,const char * ct);
 int ustrtoul(const char *cp, char **endp, unsigned int base);
-#ifdef CONFIG_HAS_UID
-void forceenv (char *varname, char *varvalue);
-#endif
 #if defined(CONFIG_CMD_I2C)
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);
 #endif
 #include <spi.h>
 
-void app_startup(char **);
+void app_startup(char * const *);
 
 #endif    /* ifndef __ASSEMBLY__ */