diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-09-23 01:29:43 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-09-23 01:29:43 +0900 |
| commit | b8685affe614ccf5f4ec66252b30e2e524d18948 (patch) | |
| tree | 05bc55b8a4a0451e6500f1f52651d81c0f48f012 /common/cmd_bedbug.c | |
| parent | 69df3c4da0c93017cceb25a366e794570bd0ed98 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
| download | talos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.tar.gz talos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.zip | |
Merge git://www.denx.de/git/u-boot
Conflicts:
CREDITS
Diffstat (limited to 'common/cmd_bedbug.c')
| -rw-r--r-- | common/cmd_bedbug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 48086a6280..1c3547a1fc 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) +#if defined(CONFIG_CMD_BEDBUG) #ifndef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) @@ -413,7 +413,7 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump, "rdump - Show registers.\n", " - Show registers.\n"); /* ====================================================================== */ -#endif /* CFG_CMD_BEDBUG */ +#endif /* |
