diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-09 23:59:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 23:59:11 +0200 |
| commit | 52bacb9879e14e39dbb523c90981698927767a7f (patch) | |
| tree | 7b0055e4148b7b4ccb71b9ecd4ebd73b55365df2 /common/cmd_mem.c | |
| parent | 4bc07c368076560ed7fa4c9f987c71a8521488a9 (diff) | |
| parent | 8b9e4787641719d709bfa2ebeb72e8bd4952bee7 (diff) | |
| download | u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.zip u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.tar.gz u-boot-imx-52bacb9879e14e39dbb523c90981698927767a7f.tar.bz2 | |
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'common/cmd_mem.c')
| -rw-r--r-- | common/cmd_mem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 4766c24..d0a6ca8 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1227,7 +1227,6 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /**************************************************/ -#if defined(CONFIG_CMD_MEMORY) U_BOOT_CMD( md, 3, 1, do_mem_md, "md - memory display\n", @@ -1338,4 +1337,3 @@ U_BOOT_CMD( #endif /* CONFIG_CMD_UNZIP */ #endif -#endif |