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/devfsd.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/devfsd.c')
-rw-r--r-- | miscutils/devfsd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 706276015..6493fe4f1 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -58,7 +58,6 @@ | |||
58 | //usage: "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]") | 58 | //usage: "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]") |
59 | //usage:#define devfsd_full_usage "\n\n" | 59 | //usage:#define devfsd_full_usage "\n\n" |
60 | //usage: "Manage devfs permissions and old device name symlinks\n" | 60 | //usage: "Manage devfs permissions and old device name symlinks\n" |
61 | //usage: "\nOptions:" | ||
62 | //usage: "\n mntpnt The mount point where devfs is mounted" | 61 | //usage: "\n mntpnt The mount point where devfs is mounted" |
63 | //usage: "\n -v Print the protocol version numbers for devfsd" | 62 | //usage: "\n -v Print the protocol version numbers for devfsd" |
64 | //usage: "\n and the kernel-side protocol version and exit" | 63 | //usage: "\n and the kernel-side protocol version and exit" |