diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:23:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:23:36 +0200 |
| commit | d48455ad8cefd25d7b49f68fd16d0e9fd551732a (patch) | |
| tree | 5f24f632e081cddda7c55b1934b145f2ebf130e8 /common | |
| parent | 1211a4648515de680c33ba58d2867305416b9f88 (diff) | |
| parent | 16e00992d818cd20a17de97dffccc4fee500fcc0 (diff) | |
| download | blackbird-obmc-uboot-d48455ad8cefd25d7b49f68fd16d0e9fd551732a.tar.gz blackbird-obmc-uboot-d48455ad8cefd25d7b49f68fd16d0e9fd551732a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 8a812379a6..634d03684b 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -653,7 +653,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } if (strcmp(cmd, "unlock") == 0) { - if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0) + if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size) < 0) return 1; if (!nand_unlock(&nand_info[dev], off, size)) { |
