diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 08:54:56 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 08:54:56 -0500 |
commit | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch) | |
tree | d2295a923fabb1b01b25bb015c4c2e42ee9df5ca /drivers/char/pty.c | |
parent | 858770619debfb9269add63e4ba8b7c6b5538dd1 (diff) | |
parent | 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff) |
Merge branch 'core/xen' into x86/urgent
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 |