diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
| commit | 667d5dd0a428a790df5a73d044cf9a8882ee92f8 (patch) | |
| tree | 76291debc380e8d31991c3d2eddcf0add131c7a3 /miscutils | |
| parent | 8782950636f76faa8db0ed8c5d698ab0bd1fbf45 (diff) | |
| parent | d35cbad0efaa57bf7c5280e62825966f7757906a (diff) | |
| download | busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.gz busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.bz2 busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.zip | |
Merge branch 'busybox' into merge
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/setserial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/setserial.c b/miscutils/setserial.c index 2a034e32c..dfed3306e 100644 --- a/miscutils/setserial.c +++ b/miscutils/setserial.c | |||
| @@ -223,7 +223,7 @@ struct serial_struct { | |||
| 223 | //usage: " -v Verbose\n" | 223 | //usage: " -v Verbose\n" |
| 224 | //usage: "\n" | 224 | //usage: "\n" |
| 225 | //usage: "Parameters: (* = takes an argument, ^ = can be turned off by preceding ^)\n" | 225 | //usage: "Parameters: (* = takes an argument, ^ = can be turned off by preceding ^)\n" |
| 226 | //usage: " *port, *irq, *divisor, *uart, *baund_base, *close_delay, *closing_wait,\n" | 226 | //usage: " *port, *irq, *divisor, *uart, *baud_base, *close_delay, *closing_wait,\n" |
| 227 | //usage: " ^fourport, ^auto_irq, ^skip_test, ^sak, ^session_lockout, ^pgrp_lockout,\n" | 227 | //usage: " ^fourport, ^auto_irq, ^skip_test, ^sak, ^session_lockout, ^pgrp_lockout,\n" |
| 228 | //usage: " ^callout_nohup, ^split_termios, ^hup_notify, ^low_latency, autoconfig,\n" | 228 | //usage: " ^callout_nohup, ^split_termios, ^hup_notify, ^low_latency, autoconfig,\n" |
| 229 | //usage: " spd_normal, spd_hi, spd_vhi, spd_shi, spd_warp, spd_cust\n" | 229 | //usage: " spd_normal, spd_hi, spd_vhi, spd_shi, spd_warp, spd_cust\n" |
| @@ -311,7 +311,7 @@ static const char commands[] = | |||
| 311 | "irq\0" | 311 | "irq\0" |
| 312 | "divisor\0" | 312 | "divisor\0" |
| 313 | "uart\0" | 313 | "uart\0" |
| 314 | "baund_base\0" | 314 | "baud_base\0" |
| 315 | "close_delay\0" | 315 | "close_delay\0" |
| 316 | "closing_wait\0" | 316 | "closing_wait\0" |
| 317 | 317 | ||