diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /miscutils/nandwrite.c | |
parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'miscutils/nandwrite.c')
-rw-r--r-- | miscutils/nandwrite.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c index c7fbe7d9c..768aed116 100644 --- a/miscutils/nandwrite.c +++ b/miscutils/nandwrite.c | |||
@@ -32,7 +32,6 @@ | |||
32 | //usage: "[-p] [-s ADDR] MTD_DEVICE [FILE]" | 32 | //usage: "[-p] [-s ADDR] MTD_DEVICE [FILE]" |
33 | //usage:#define nandwrite_full_usage "\n\n" | 33 | //usage:#define nandwrite_full_usage "\n\n" |
34 | //usage: "Write to the specified MTD device\n" | 34 | //usage: "Write to the specified MTD device\n" |
35 | //usage: "\nOptions:" | ||
36 | //usage: "\n -p Pad to page size" | 35 | //usage: "\n -p Pad to page size" |
37 | //usage: "\n -s ADDR Start address" | 36 | //usage: "\n -s ADDR Start address" |
38 | 37 | ||
@@ -40,7 +39,6 @@ | |||
40 | //usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE" | 39 | //usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE" |
41 | //usage:#define nanddump_full_usage "\n\n" | 40 | //usage:#define nanddump_full_usage "\n\n" |
42 | //usage: "Dump the sepcified MTD device\n" | 41 | //usage: "Dump the sepcified MTD device\n" |
43 | //usage: "\nOptions:" | ||
44 | //usage: "\n -o Omit oob data" | 42 | //usage: "\n -o Omit oob data" |
45 | //usage: "\n -b Omit bad block from the dump" | 43 | //usage: "\n -b Omit bad block from the dump" |
46 | //usage: "\n -s ADDR Start address" | 44 | //usage: "\n -s ADDR Start address" |