diff options
author | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-11 10:34:54 (GMT) |
commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /common/cmd_misc.c | |
parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
download | u-boot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.xz |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'common/cmd_misc.c')
-rw-r--r-- | common/cmd_misc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_misc.c b/common/cmd_misc.c index c0c6b8f..126b538 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 |