summaryrefslogtreecommitdiffstats
path: root/common/cmd_misc.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-01-09 13:57:10 +0100
committerMarkus Klotzbuecher <mk@denx.de>2008-01-09 13:57:10 +0100
commit6a40ef62c4300e9f606deef0a4618cbc4b514a51 (patch)
treec01bdd0e773d092f13af05567fa92fb9072df9e0 /common/cmd_misc.c
parent245a362ad3c0c1b84fccc9fec7b623eb14f6e502 (diff)
parent07eb02687f008721974a2fb54cd7fdc28033ab3c (diff)
downloadu-boot-6a40ef62c4300e9f606deef0a4618cbc4b514a51.tar.gz
u-boot-6a40ef62c4300e9f606deef0a4618cbc4b514a51.tar.xz
u-boot-6a40ef62c4300e9f606deef0a4618cbc4b514a51.zip
Merge git://www.denx.de/git/u-boot
Conflicts: board/tqm5200/tqm5200.c
Diffstat (limited to 'common/cmd_misc.c')
-rw-r--r--common/cmd_misc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index c0c6b8f05a..126b538ce8 100644
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,8 +27,6 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_MISC)
-
int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
ulong start = get_timer(0);
@@ -68,5 +66,3 @@ U_BOOT_CMD(
"N\n"
" - delay execution for N seconds (N is _decimal_ !!!)\n"
);
-
-#endif