diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-15 09:45:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-15 09:45:31 -0500 |
| commit | 49a93bc978b4b3d564f6b330179b4cc2724a031d (patch) | |
| tree | 8b14b6c1d32b2a64bd9e7d0793717780ecc1d985 /drivers/char/pty.c | |
| parent | 54da5b3d44238eeb7417bacf792fb416d473bf4d (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/char/pty.c')
| -rw-r--r-- | drivers/char/pty.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 146c97613da0..31038a0052a2 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
| @@ -230,9 +230,7 @@ static void pty_set_termios(struct tty_struct *tty, | |||
| 230 | /** | 230 | /** |
| 231 | * pty_do_resize - resize event | 231 | * pty_do_resize - resize event |
| 232 | * @tty: tty being resized | 232 | * @tty: tty being resized |
| 233 | * @real_tty: real tty (not the same as tty if using a pty/tty pair) | 233 | * @ws: window size being set. |
| 234 | * @rows: rows (character) | ||
| 235 | * @cols: cols (character) | ||
| 236 | * | 234 | * |
| 237 | * Update the termios variables and send the neccessary signals to | 235 | * Update the termios variables and send the neccessary signals to |
| 238 | * peform a terminal resize correctly | 236 | * peform a terminal resize correctly |