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

[karo-tx-uboot.git] / include / exports.h

diff --git a/include/exports.h b/include/exports.h
index 16ea03a6bd44834cac46a5504eb0a94c63257e95..1d79a3162c07cbbddb65a015dfccfbf57aae326e 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -11,14 +11,14 @@ int  getc(void);
 int  tstc(void);
 void putc(const char);
 void puts(const char*);
-void printf(const char* fmt, ...);
+int printf(const char* fmt, ...);
 void install_hdlr(int, interrupt_handler_t*, void*);
 void free_hdlr(int);
 void *malloc(size_t);
 void free(void*);
-void udelay(unsigned long);
+void __udelay(unsigned long);
 unsigned long get_timer(unsigned long);
-void vprintf(const char *, va_list);
+int vprintf(const char *, va_list);
 void do_reset (void);
 unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);
 char *getenv (char *name);
@@ -35,7 +35,7 @@ int i2c_read (uchar, uint, int , uchar* , int);
 #endif
 #include <spi.h>
 
-void app_startup(char **);
+void app_startup(char * const *);
 
 #endif    /* ifndef __ASSEMBLY__ */
 
@@ -47,7 +47,7 @@ enum {
        XF_MAX
 };
 
-#define XF_VERSION     5
+#define XF_VERSION     6
 
 #if defined(CONFIG_I386)
 extern gd_t *global_data;