summaryrefslogtreecommitdiffstats
path: root/common/hush.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-20 03:41:17 -0400
committerWolfgang Denk <wd@denx.de>2010-11-28 21:47:24 +0100
commit882b7d726febe65579d6502c271412ecb05821d7 (patch)
tree9932868dab6e8a9e3a0d4fcc350d0ec4511648b4 /common/hush.c
parent7842fb7c4f5be961c7aa9091dc8c760683b1377c (diff)
downloadtalos-obmc-uboot-882b7d726febe65579d6502c271412ecb05821d7.tar.gz
talos-obmc-uboot-882b7d726febe65579d6502c271412ecb05821d7.zip
do_reset: unify duplicate prototypes
The duplication of the do_reset prototype has gotten out of hand, and they're not all in sync. Unify them all in command.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/hush.c')
-rw-r--r--common/hush.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/common/hush.c b/common/hush.c
index 0f101bff1c..8021a68446 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1021,9 +1021,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();
OpenPOWER on IntegriCloud