diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
| commit | 375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch) | |
| tree | c8499eaec089c8fe7c9eda562131f45b4a7738c6 /common/cmd_diag.c | |
| parent | f0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | olio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.xz olio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'common/cmd_diag.c')
| -rw-r--r-- | common/cmd_diag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_diag.c b/common/cmd_diag.c index 45c4b31f5..cb99b7700 100644 --- a/common/cmd_diag.c +++ b/common/cmd_diag.c @@ -28,7 +28,7 @@ #include <command.h> #include <post.h> -#if (CONFIG_COMMANDS & CFG_CMD_DIAG) && defined(CONFIG_POST) +#if defined(CONFIG_CMD_DIAG) && defined(CONFIG_POST) int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { @@ -77,4 +77,4 @@ U_BOOT_CMD( " - run specified tests\n" ); -#endif /* CFG_CMD_DIAG */ +#endif |