This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Documentation / tty.txt

diff --git a/Documentation/tty.txt b/Documentation/tty.txt
index 3958cf7..a496056 100644 (file)
--- a/Documentation/tty.txt
+++ b/Documentation/tty.txt
@@ -49,9 +49,10 @@ open()               -       Called when the line discipline is attached to
                        discipline for this tty will occur until it
                        completes successfully. Can sleep.
 
-write()                -       A process is writing data through the line
-                       discipline.  Multiple write calls are serialized
-                       by the tty layer for the ldisc.  May sleep. 
+write()                -       A process is writing data from user space
+                       through the line discipline. Multiple write calls
+                       are serialized by the tty layer for the ldisc. May
+                       sleep.
 
 flush_buffer() -       May be called at any point between open and close.
 
@@ -93,11 +94,6 @@ write_wakeup()       -       May be called at any point between open and close.
                        ldisc must be careful about setting order and to
                        handle unexpected calls. Must not sleep.
 
-                       The driver is forbidden from calling this directly
-                       from the ->write call from the ldisc as the ldisc
-                       is permitted to call the driver write method from
-                       this function. In such a situation defer it.
-
 
 Locking