summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-12 01:26:20 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-10-12 01:26:20 +0200
commit34a7ceeff449be015a37d0e3f3178ca313618349 (patch)
treedda85b95dfa92302c7abf3f7243c79b19f089549 /common
parent7e2a24dca9a3213f0b4941562e4387e20bec3e2d (diff)
parentea237a4d258f269785e984ad031f752536b4eedf (diff)
downloadu-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.zip
u-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.tar.gz
u-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.tar.bz2
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nand.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 274ef0b..fdbe7c7 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -341,7 +341,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return ret == 0 ? 0 : 1;
}
- /* 2006-09-28 gc: implement missing commands */
if (strcmp(cmd, "markbad") == 0) {
addr = (ulong)simple_strtoul(argv[2], NULL, 16);