diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /Documentation/serial/tty.txt | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'Documentation/serial/tty.txt')
| -rw-r--r-- | Documentation/serial/tty.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt index 5e5349a4fcd2..7c900507279f 100644 --- a/Documentation/serial/tty.txt +++ b/Documentation/serial/tty.txt | |||
| @@ -105,6 +105,10 @@ write_wakeup() - May be called at any point between open and close. | |||
| 105 | is permitted to call the driver write method from | 105 | is permitted to call the driver write method from |
| 106 | this function. In such a situation defer it. | 106 | this function. In such a situation defer it. |
| 107 | 107 | ||
| 108 | dcd_change() - Report to the tty line the current DCD pin status | ||
| 109 | changes and the relative timestamp. The timestamp | ||
| 110 | can be NULL. | ||
| 111 | |||
| 108 | 112 | ||
| 109 | Driver Access | 113 | Driver Access |
| 110 | 114 | ||