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

[u-boot] / common / hush.c

diff --git a/common/hush.c b/common/hush.c
index 0f101bff1cefdbfefe8c7f8cfe88cda772625384..85a603071f15835258341594e26200d6f3d329a1 100644 (file)
--- a/common/hush.c
+++ b/common/hush.c
@@ -497,7 +497,6 @@ static void remove_bg_job(struct pipe *pi);
 /*     local variable support */
 static char **make_list_in(char **inp, char *name);
 static char *insert_var_value(char *inp);
-static char *get_local_var(const char *var);
 
 #ifndef __U_BOOT__
 /* Table of built-in functions.  They can be forked or not, depending on
@@ -1021,9 +1020,7 @@ static void get_user_input(struct in_str *i)
        static char the_command[CONFIG_SYS_CBSIZE];
 
 #ifdef CONFIG_BOOT_RETRY_TIME
-#  ifdef CONFIG_RESET_TO_RETRY
-       extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-#  else
+#  ifndef CONFIG_RESET_TO_RETRY
 #      error "This currently only works with CONFIG_RESET_TO_RETRY enabled"
 #  endif
        reset_cmd_timeout();
@@ -2171,7 +2168,7 @@ static char *get_dollar_var(char ch);
 #endif
 
 /* This is used to get/check local shell variables */
-static char *get_local_var(const char *s)
+char *get_local_var(const char *s)
 {
        struct variables *cur;