aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 21:00:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 21:00:38 -0700
commit0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3 (patch)
tree6e0a8c2bbd33c1cec2af6fbb1a6665751c07a631 /Documentation
parent92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (diff)
parent026d02a236f429eb61a1277166bd425f8514c431 (diff)
downloadmrst-s0i3-test-0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3.tar.gz
mrst-s0i3-test-0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3.tar.xz
mrst-s0i3-test-0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/serial/driver4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index e9c0178cd20..ac7eabbf662 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -107,8 +107,8 @@ hardware.
indicate that the signal is permanently active. If RI is
not available, the signal should not be indicated as active.
- Locking: none.
- Interrupts: caller dependent.
+ Locking: port->lock taken.
+ Interrupts: locally disabled.
This call must not sleep
stop_tx(port,tty_stop)