diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/hamradio | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/baycom_ser_fdx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index ed60fd664273..0cab992b3d1a 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | * driver only supports standard serial hardware (8250, 16450, 16550A) | 35 | * driver only supports standard serial hardware (8250, 16450, 16550A) |
| 36 | * | 36 | * |
| 37 | * This modem usually draws its supply current out of the otherwise unused | 37 | * This modem usually draws its supply current out of the otherwise unused |
| 38 | * TXD pin of the serial port. Thus a contignuous stream of 0x00-bytes | 38 | * TXD pin of the serial port. Thus a contiguous stream of 0x00-bytes |
| 39 | * is transmitted to achieve a positive supply voltage. | 39 | * is transmitted to achieve a positive supply voltage. |
| 40 | * | 40 | * |
| 41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine | 41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine |