diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-05 04:11:59 +0300 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-05 04:11:59 +0300 |
commit | 2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch) | |
tree | e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /common/cmd_misc.c | |
parent | cd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff) | |
parent | f68ab43de67f59925542efb6bcec30f4a84fe695 (diff) | |
download | u-boot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.xz |
Merge branch 'master' into next
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/cmd_misc.c')
-rw-r--r-- | common/cmd_misc.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/common/cmd_misc.c b/common/cmd_misc.c index b97537ecd0..b0ced2f3b8 100644 --- a/common/cmd_misc.c +++ b/common/cmd_misc.c @@ -49,17 +49,6 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -/* Implemented in $(CPU)/interrupts.c */ -#if defined(CONFIG_CMD_IRQ) -int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - -U_BOOT_CMD( - irqinfo, 1, 1, do_irqinfo, - "print information about IRQs", - "" -); -#endif - U_BOOT_CMD( sleep , 2, 1, do_sleep, "delay execution for some time", |