diff options
author | Greg KH <greg@press.(none)> | 2005-06-29 22:54:31 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-29 22:54:31 -0700 |
commit | bf164c790deb79b18faf304b0763e44a02c79f90 (patch) | |
tree | 8fedcdce1f65aa6bc98fea0da6227d3fc0fc51fd /Documentation/serial/driver | |
parent | d62c0f9fd2d3943a3eca85b490d86e1605000ccb (diff) | |
parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/serial/driver')
-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 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) |