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/eject.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/eject.c')
| -rw-r--r-- | miscutils/eject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c index 184ccc5d7..a20e04b7f 100644 --- a/miscutils/eject.c +++ b/miscutils/eject.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | //usage: "[-t] [-T] [DEVICE]" | 17 | //usage: "[-t] [-T] [DEVICE]" |
| 18 | //usage:#define eject_full_usage "\n\n" | 18 | //usage:#define eject_full_usage "\n\n" |
| 19 | //usage: "Eject DEVICE or default /dev/cdrom\n" | 19 | //usage: "Eject DEVICE or default /dev/cdrom\n" |
| 20 | //usage: "\nOptions:" | ||
| 21 | //usage: IF_FEATURE_EJECT_SCSI( | 20 | //usage: IF_FEATURE_EJECT_SCSI( |
| 22 | //usage: "\n -s SCSI device" | 21 | //usage: "\n -s SCSI device" |
| 23 | //usage: ) | 22 | //usage: ) |