diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:00:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:00:38 -0400 |
| commit | 0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3 (patch) | |
| tree | 6e0a8c2bbd33c1cec2af6fbb1a6665751c07a631 /Documentation | |
| parent | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (diff) | |
| parent | 026d02a236f429eb61a1277166bd425f8514c431 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/serial/driver | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver index e9c0178cd202..ac7eabbf662a 100644 --- a/Documentation/serial/driver +++ b/Documentation/serial/driver | |||
| @@ -107,8 +107,8 @@ hardware. | |||
| 107 | indicate that the signal is permanently active. If RI is | 107 | indicate that the signal is permanently active. If RI is |
| 108 | not available, the signal should not be indicated as active. | 108 | not available, the signal should not be indicated as active. |
| 109 | 109 | ||
| 110 | Locking: none. | 110 | Locking: port->lock taken. |
| 111 | Interrupts: caller dependent. | 111 | Interrupts: locally disabled. |
| 112 | This call must not sleep | 112 | This call must not sleep |
| 113 | 113 | ||
| 114 | stop_tx(port,tty_stop) | 114 | stop_tx(port,tty_stop) |