diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
| commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
| tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /common/cmd_diag.c | |
| parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
| parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
| download | u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.gz u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'common/cmd_diag.c')
| -rw-r--r-- | common/cmd_diag.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_diag.c b/common/cmd_diag.c index cb99b77..82d5ad3 100644 --- a/common/cmd_diag.c +++ b/common/cmd_diag.c @@ -28,8 +28,6 @@ #include <command.h> #include <post.h> -#if defined(CONFIG_CMD_DIAG) && defined(CONFIG_POST) - int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { unsigned int i; @@ -76,5 +74,3 @@ U_BOOT_CMD( "diag run [test1 [test2]]\n" " - run specified tests\n" ); - -#endif |